From 9410c519ffe531b0bd09a9bd19bbd60a1f6bfd64 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 11 Jan 2024 08:20:15 -0600 Subject: [PATCH] drivers/raw_exec: remove plumbing for ineffective no_cgroups configuration (#19599) * drivers/raw_exec: remove plumbing for ineffective no_cgroups configuration * fix tests --- drivers/rawexec/driver.go | 36 ++--- drivers/rawexec/driver_test.go | 12 +- drivers/rawexec/driver_unix_test.go | 2 +- drivers/shared/executor/executor.go | 5 - drivers/shared/executor/grpc_client.go | 33 ++-- drivers/shared/executor/grpc_server.go | 33 ++-- drivers/shared/executor/proto/executor.pb.go | 141 +++++++++--------- drivers/shared/executor/proto/executor.proto | 2 +- .../content/docs/upgrade/upgrade-specific.mdx | 8 + 9 files changed, 123 insertions(+), 149 deletions(-) diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index 4c998471c..18f20b4f7 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -8,9 +8,7 @@ import ( "fmt" "os" "path/filepath" - "runtime" "strconv" - "syscall" "time" "github.com/hashicorp/consul-template/signals" @@ -61,9 +59,6 @@ func PluginLoader(opts map[string]string) (map[string]interface{}, error) { if v, err := strconv.ParseBool(opts["driver.raw_exec.enable"]); err == nil { conf["enabled"] = v } - if v, err := strconv.ParseBool(opts["driver.raw_exec.no_cgroups"]); err == nil { - conf["no_cgroups"] = v - } return conf, nil } @@ -82,10 +77,6 @@ var ( hclspec.NewAttr("enabled", "bool", false), hclspec.NewLiteral("false"), ), - "no_cgroups": hclspec.NewDefault( - hclspec.NewAttr("no_cgroups", "bool", false), - hclspec.NewLiteral("false"), - ), }) // taskConfigSpec is the hcl specification for the driver config section of @@ -139,10 +130,6 @@ type Driver struct { // Config is the driver configuration set by the SetConfig RPC call type Config struct { - // NoCgroups tracks whether we should use a cgroup to manage the process - // tree - NoCgroups bool `codec:"no_cgroups"` - // Enabled is set to true to enable the raw_exec driver Enabled bool `codec:"enabled"` } @@ -336,21 +323,16 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive return nil, nil, fmt.Errorf("failed to create executor: %v", err) } - // Only use cgroups when running as root on linux - Doing so in other cases - // will cause an error. - useCgroups := !d.config.NoCgroups && runtime.GOOS == "linux" && syscall.Geteuid() == 0 - execCmd := &executor.ExecCommand{ - Cmd: driverConfig.Command, - Args: driverConfig.Args, - Env: cfg.EnvList(), - User: cfg.User, - BasicProcessCgroup: useCgroups, - TaskDir: cfg.TaskDir().Dir, - StdoutPath: cfg.StdoutPath, - StderrPath: cfg.StderrPath, - NetworkIsolation: cfg.NetworkIsolation, - Resources: cfg.Resources.Copy(), + Cmd: driverConfig.Command, + Args: driverConfig.Args, + Env: cfg.EnvList(), + User: cfg.User, + TaskDir: cfg.TaskDir().Dir, + StdoutPath: cfg.StdoutPath, + StderrPath: cfg.StderrPath, + NetworkIsolation: cfg.NetworkIsolation, + Resources: cfg.Resources.Copy(), } ps, err := exec.Launch(execCmd) diff --git a/drivers/rawexec/driver_test.go b/drivers/rawexec/driver_test.go index b2315969a..35a60fc2b 100644 --- a/drivers/rawexec/driver_test.go +++ b/drivers/rawexec/driver_test.go @@ -118,15 +118,6 @@ func TestRawExecDriver_SetConfig(t *testing.T) { // Enable raw_exec, but disable cgroups. config.Enabled = true - config.NoCgroups = true - data = []byte{} - require.NoError(basePlug.MsgPackEncode(&data, config)) - bconfig.PluginConfig = data - require.NoError(harness.SetConfig(bconfig)) - require.Exactly(config, d.(*Driver).config) - - // Enable raw_exec, enable cgroups. - config.NoCgroups = false data = []byte{} require.NoError(basePlug.MsgPackEncode(&data, config)) bconfig.PluginConfig = data @@ -254,8 +245,7 @@ func TestRawExecDriver_StartWaitRecoverWaitStop(t *testing.T) { harness := dtestutil.NewDriverHarness(t, d) defer harness.Kill() - // Disable cgroups so test works without root - config := &Config{NoCgroups: true, Enabled: true} + config := &Config{Enabled: true} var data []byte require.NoError(basePlug.MsgPackEncode(&data, config)) bconfig := &basePlug.Config{ diff --git a/drivers/rawexec/driver_unix_test.go b/drivers/rawexec/driver_unix_test.go index 55f5212a4..a66acbf96 100644 --- a/drivers/rawexec/driver_unix_test.go +++ b/drivers/rawexec/driver_unix_test.go @@ -148,7 +148,7 @@ func TestRawExecDriver_StartWaitStop(t *testing.T) { harness := dtestutil.NewDriverHarness(t, d) defer harness.Kill() - config := &Config{NoCgroups: false, Enabled: true} + config := &Config{Enabled: true} var data []byte require.NoError(base.MsgPackEncode(&data, config)) bconfig := &base.Config{ diff --git a/drivers/shared/executor/executor.go b/drivers/shared/executor/executor.go index afd7ba809..a733a357b 100644 --- a/drivers/shared/executor/executor.go +++ b/drivers/shared/executor/executor.go @@ -129,11 +129,6 @@ type ExecCommand struct { // executor. ResourceLimits bool - // Cgroup marks whether we put the process in a cgroup. Setting this field - // doesn't enforce resource limits. To enforce limits, set ResourceLimits. - // Using the cgroup does allow more precise cleanup of processes. - BasicProcessCgroup bool - // NoPivotRoot disables using pivot_root for isolation, useful when the root // partition is on a ramdisk which does not support pivot_root, // see man 2 pivot_root diff --git a/drivers/shared/executor/grpc_client.go b/drivers/shared/executor/grpc_client.go index b13fe04b8..a25a0aba2 100644 --- a/drivers/shared/executor/grpc_client.go +++ b/drivers/shared/executor/grpc_client.go @@ -36,23 +36,22 @@ type grpcExecutorClient struct { func (c *grpcExecutorClient) Launch(cmd *ExecCommand) (*ProcessState, error) { ctx := context.Background() req := &proto.LaunchRequest{ - Cmd: cmd.Cmd, - Args: cmd.Args, - Resources: drivers.ResourcesToProto(cmd.Resources), - StdoutPath: cmd.StdoutPath, - StderrPath: cmd.StderrPath, - Env: cmd.Env, - User: cmd.User, - TaskDir: cmd.TaskDir, - ResourceLimits: cmd.ResourceLimits, - BasicProcessCgroup: cmd.BasicProcessCgroup, - NoPivotRoot: cmd.NoPivotRoot, - Mounts: drivers.MountsToProto(cmd.Mounts), - Devices: drivers.DevicesToProto(cmd.Devices), - NetworkIsolation: drivers.NetworkIsolationSpecToProto(cmd.NetworkIsolation), - DefaultPidMode: cmd.ModePID, - DefaultIpcMode: cmd.ModeIPC, - Capabilities: cmd.Capabilities, + Cmd: cmd.Cmd, + Args: cmd.Args, + Resources: drivers.ResourcesToProto(cmd.Resources), + StdoutPath: cmd.StdoutPath, + StderrPath: cmd.StderrPath, + Env: cmd.Env, + User: cmd.User, + TaskDir: cmd.TaskDir, + ResourceLimits: cmd.ResourceLimits, + NoPivotRoot: cmd.NoPivotRoot, + Mounts: drivers.MountsToProto(cmd.Mounts), + Devices: drivers.DevicesToProto(cmd.Devices), + NetworkIsolation: drivers.NetworkIsolationSpecToProto(cmd.NetworkIsolation), + DefaultPidMode: cmd.ModePID, + DefaultIpcMode: cmd.ModeIPC, + Capabilities: cmd.Capabilities, } resp, err := c.client.Launch(ctx, req) if err != nil { diff --git a/drivers/shared/executor/grpc_server.go b/drivers/shared/executor/grpc_server.go index d6c7413d4..2e5530bbe 100644 --- a/drivers/shared/executor/grpc_server.go +++ b/drivers/shared/executor/grpc_server.go @@ -25,23 +25,22 @@ type grpcExecutorServer struct { func (s *grpcExecutorServer) Launch(ctx context.Context, req *proto.LaunchRequest) (*proto.LaunchResponse, error) { ps, err := s.impl.Launch(&ExecCommand{ - Cmd: req.Cmd, - Args: req.Args, - Resources: drivers.ResourcesFromProto(req.Resources), - StdoutPath: req.StdoutPath, - StderrPath: req.StderrPath, - Env: req.Env, - User: req.User, - TaskDir: req.TaskDir, - ResourceLimits: req.ResourceLimits, - BasicProcessCgroup: req.BasicProcessCgroup, - NoPivotRoot: req.NoPivotRoot, - Mounts: drivers.MountsFromProto(req.Mounts), - Devices: drivers.DevicesFromProto(req.Devices), - NetworkIsolation: drivers.NetworkIsolationSpecFromProto(req.NetworkIsolation), - ModePID: req.DefaultPidMode, - ModeIPC: req.DefaultIpcMode, - Capabilities: req.Capabilities, + Cmd: req.Cmd, + Args: req.Args, + Resources: drivers.ResourcesFromProto(req.Resources), + StdoutPath: req.StdoutPath, + StderrPath: req.StderrPath, + Env: req.Env, + User: req.User, + TaskDir: req.TaskDir, + ResourceLimits: req.ResourceLimits, + NoPivotRoot: req.NoPivotRoot, + Mounts: drivers.MountsFromProto(req.Mounts), + Devices: drivers.DevicesFromProto(req.Devices), + NetworkIsolation: drivers.NetworkIsolationSpecFromProto(req.NetworkIsolation), + ModePID: req.DefaultPidMode, + ModeIPC: req.DefaultIpcMode, + Capabilities: req.Capabilities, }) if err != nil { diff --git a/drivers/shared/executor/proto/executor.pb.go b/drivers/shared/executor/proto/executor.pb.go index 71d10ab52..b75694a19 100644 --- a/drivers/shared/executor/proto/executor.pb.go +++ b/drivers/shared/executor/proto/executor.pb.go @@ -36,7 +36,7 @@ type LaunchRequest struct { User string `protobuf:"bytes,7,opt,name=user,proto3" json:"user,omitempty"` TaskDir string `protobuf:"bytes,8,opt,name=task_dir,json=taskDir,proto3" json:"task_dir,omitempty"` ResourceLimits bool `protobuf:"varint,9,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` - BasicProcessCgroup bool `protobuf:"varint,10,opt,name=basic_process_cgroup,json=basicProcessCgroup,proto3" json:"basic_process_cgroup,omitempty"` + BasicProcessCgroup bool `protobuf:"varint,10,opt,name=basic_process_cgroup,json=basicProcessCgroup,proto3" json:"basic_process_cgroup,omitempty"` // Deprecated: Do not use. Mounts []*proto1.Mount `protobuf:"bytes,11,rep,name=mounts,proto3" json:"mounts,omitempty"` Devices []*proto1.Device `protobuf:"bytes,12,rep,name=devices,proto3" json:"devices,omitempty"` NetworkIsolation *proto1.NetworkIsolationSpec `protobuf:"bytes,13,opt,name=network_isolation,json=networkIsolation,proto3" json:"network_isolation,omitempty"` @@ -139,6 +139,7 @@ func (m *LaunchRequest) GetResourceLimits() bool { return false } +// Deprecated: Do not use. func (m *LaunchRequest) GetBasicProcessCgroup() bool { if m != nil { return m.BasicProcessCgroup @@ -882,75 +883,75 @@ func init() { } var fileDescriptor_66b85426380683f3 = []byte{ - // 1079 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x7d, 0x6f, 0x1b, 0xc5, - 0x13, 0xee, 0xc5, 0x89, 0x5f, 0xc6, 0x76, 0xe2, 0xee, 0xef, 0xa7, 0x70, 0x35, 0x42, 0x35, 0x87, - 0x44, 0x2d, 0x28, 0x97, 0x28, 0x7d, 0x43, 0x42, 0xa2, 0x88, 0xa4, 0xa0, 0x8a, 0x34, 0x8a, 0x2e, - 0x85, 0x4a, 0xfc, 0xc1, 0xb1, 0xb9, 0xdb, 0xda, 0x2b, 0x9f, 0x6f, 0x8f, 0xdd, 0x3d, 0x27, 0x48, - 0x48, 0x7c, 0x09, 0x90, 0xf8, 0x00, 0x7c, 0x0c, 0x3e, 0x1c, 0xda, 0xb7, 0x8b, 0x9d, 0x96, 0xea, - 0x5c, 0xc4, 0x5f, 0xbe, 0x1d, 0x3f, 0xcf, 0xcc, 0xec, 0xce, 0xcc, 0x33, 0x70, 0x37, 0xe5, 0x74, - 0x41, 0xb8, 0xd8, 0x13, 0x53, 0xcc, 0x49, 0xba, 0x47, 0x2e, 0x49, 0x52, 0x4a, 0xc6, 0xf7, 0x0a, - 0xce, 0x24, 0xab, 0x8e, 0xa1, 0x3e, 0xa2, 0x0f, 0xa7, 0x58, 0x4c, 0x69, 0xc2, 0x78, 0x11, 0xe6, - 0x6c, 0x8e, 0xd3, 0xb0, 0xc8, 0xca, 0x09, 0xcd, 0x45, 0xb8, 0x8a, 0x1b, 0xde, 0x9e, 0x30, 0x36, - 0xc9, 0x88, 0x71, 0x72, 0x5e, 0xbe, 0xdc, 0x93, 0x74, 0x4e, 0x84, 0xc4, 0xf3, 0xc2, 0x02, 0x02, - 0x4b, 0xdc, 0x73, 0xe1, 0x4d, 0x38, 0x73, 0x32, 0x98, 0xe0, 0xaf, 0x26, 0xf4, 0x8f, 0x71, 0x99, - 0x27, 0xd3, 0x88, 0xfc, 0x54, 0x12, 0x21, 0xd1, 0x00, 0x1a, 0xc9, 0x3c, 0xf5, 0xbd, 0x91, 0x37, - 0xee, 0x44, 0xea, 0x13, 0x21, 0xd8, 0xc4, 0x7c, 0x22, 0xfc, 0x8d, 0x51, 0x63, 0xdc, 0x89, 0xf4, - 0x37, 0x3a, 0x81, 0x0e, 0x27, 0x82, 0x95, 0x3c, 0x21, 0xc2, 0x6f, 0x8c, 0xbc, 0x71, 0xf7, 0x60, - 0x3f, 0xfc, 0xa7, 0xc4, 0x6d, 0x7c, 0x13, 0x32, 0x8c, 0x1c, 0x2f, 0xba, 0x72, 0x81, 0x6e, 0x43, - 0x57, 0xc8, 0x94, 0x95, 0x32, 0x2e, 0xb0, 0x9c, 0xfa, 0x9b, 0x3a, 0x3a, 0x18, 0xd3, 0x29, 0x96, - 0x53, 0x0b, 0x20, 0x9c, 0x1b, 0xc0, 0x56, 0x05, 0x20, 0x9c, 0x6b, 0xc0, 0x00, 0x1a, 0x24, 0x5f, - 0xf8, 0x4d, 0x9d, 0xa4, 0xfa, 0x54, 0x79, 0x97, 0x82, 0x70, 0xbf, 0xa5, 0xb1, 0xfa, 0x1b, 0xdd, - 0x82, 0xb6, 0xc4, 0x62, 0x16, 0xa7, 0x94, 0xfb, 0x6d, 0x6d, 0x6f, 0xa9, 0xf3, 0x11, 0xe5, 0xe8, - 0x0e, 0xec, 0xb8, 0x7c, 0xe2, 0x8c, 0xce, 0xa9, 0x14, 0x7e, 0x67, 0xe4, 0x8d, 0xdb, 0xd1, 0xb6, - 0x33, 0x1f, 0x6b, 0x2b, 0xda, 0x87, 0xff, 0x9f, 0x63, 0x41, 0x93, 0xb8, 0xe0, 0x2c, 0x21, 0x42, - 0xc4, 0xc9, 0x84, 0xb3, 0xb2, 0xf0, 0x41, 0xa3, 0x91, 0xfe, 0xef, 0xd4, 0xfc, 0x75, 0xa8, 0xff, - 0x41, 0x47, 0xd0, 0x9c, 0xb3, 0x32, 0x97, 0xc2, 0xef, 0x8e, 0x1a, 0xe3, 0xee, 0xc1, 0xdd, 0x9a, - 0x4f, 0xf5, 0x4c, 0x91, 0x22, 0xcb, 0x45, 0x5f, 0x43, 0x2b, 0x25, 0x0b, 0xaa, 0x5e, 0xbc, 0xa7, - 0xdd, 0x7c, 0x52, 0xd3, 0xcd, 0x91, 0x66, 0x45, 0x8e, 0x8d, 0xa6, 0x70, 0x33, 0x27, 0xf2, 0x82, - 0xf1, 0x59, 0x4c, 0x05, 0xcb, 0xb0, 0xa4, 0x2c, 0xf7, 0xfb, 0xba, 0x88, 0x9f, 0xd5, 0x74, 0x79, - 0x62, 0xf8, 0x4f, 0x1d, 0xfd, 0xac, 0x20, 0x49, 0x34, 0xc8, 0xaf, 0x59, 0x51, 0x00, 0xfd, 0x9c, - 0xc5, 0x05, 0x5d, 0x30, 0x19, 0x73, 0xc6, 0xa4, 0xbf, 0xad, 0xdf, 0xa8, 0x9b, 0xb3, 0x53, 0x65, - 0x8b, 0x18, 0x93, 0x68, 0x0c, 0x83, 0x94, 0xbc, 0xc4, 0x65, 0x26, 0xe3, 0x82, 0xa6, 0xf1, 0x9c, - 0xa5, 0xc4, 0xdf, 0xd1, 0xa5, 0xd9, 0xb6, 0xf6, 0x53, 0x9a, 0x3e, 0x63, 0x29, 0x59, 0x46, 0xd2, - 0x22, 0x31, 0xc8, 0xc1, 0x0a, 0xf2, 0x69, 0x91, 0x68, 0xe4, 0x07, 0xd0, 0x4f, 0x8a, 0x52, 0x10, - 0xe9, 0x6a, 0x73, 0x53, 0xc3, 0x7a, 0xc6, 0x68, 0xab, 0xf2, 0x1e, 0x00, 0xce, 0x32, 0x76, 0x11, - 0x27, 0xb8, 0x10, 0x3e, 0xd2, 0x8d, 0xd3, 0xd1, 0x96, 0x43, 0x5c, 0x08, 0x14, 0x40, 0x2f, 0xc1, - 0x05, 0x3e, 0xa7, 0x19, 0x95, 0x94, 0x08, 0xff, 0x7f, 0x1a, 0xb0, 0x62, 0x0b, 0x7e, 0x84, 0x6d, - 0x37, 0x3d, 0xa2, 0x60, 0xb9, 0x20, 0xe8, 0x04, 0x5a, 0xb6, 0x2d, 0xf4, 0x08, 0x75, 0x0f, 0xee, - 0x87, 0xf5, 0xe6, 0x39, 0xb4, 0x2d, 0x73, 0x26, 0xb1, 0x24, 0x91, 0x73, 0x12, 0xf4, 0xa1, 0xfb, - 0x02, 0x53, 0x69, 0xa7, 0x33, 0xf8, 0x01, 0x7a, 0xe6, 0xf8, 0x1f, 0x85, 0x3b, 0x86, 0x9d, 0xb3, - 0x69, 0x29, 0x53, 0x76, 0x91, 0x3b, 0x41, 0xd8, 0x85, 0xa6, 0xa0, 0x93, 0x1c, 0x67, 0x56, 0x13, - 0xec, 0x09, 0xbd, 0x0f, 0xbd, 0x09, 0xc7, 0x09, 0x89, 0x0b, 0xc2, 0x29, 0x4b, 0xfd, 0x8d, 0x91, - 0x37, 0x6e, 0x44, 0x5d, 0x6d, 0x3b, 0xd5, 0xa6, 0x00, 0xc1, 0xe0, 0xca, 0x9b, 0xc9, 0x38, 0x98, - 0xc2, 0xee, 0xb7, 0x45, 0xaa, 0x82, 0x56, 0x3a, 0x60, 0x03, 0xad, 0x68, 0x8a, 0xf7, 0xaf, 0x35, - 0x25, 0xb8, 0x05, 0xef, 0xbc, 0x12, 0xc9, 0x26, 0x31, 0x80, 0xed, 0xef, 0x08, 0x17, 0x94, 0xb9, - 0x5b, 0x06, 0x1f, 0xc3, 0x4e, 0x65, 0xb1, 0x6f, 0xeb, 0x43, 0x6b, 0x61, 0x4c, 0xf6, 0xe6, 0xee, - 0x18, 0x7c, 0x04, 0x3d, 0xf5, 0x6e, 0x55, 0xe6, 0x43, 0x68, 0xd3, 0x5c, 0x12, 0xbe, 0xb0, 0x8f, - 0xd4, 0x88, 0xaa, 0x73, 0xf0, 0x02, 0xfa, 0x16, 0x6b, 0xdd, 0x7e, 0x05, 0x5b, 0x42, 0x19, 0xd6, - 0xbc, 0xe2, 0x73, 0x2c, 0x66, 0xc6, 0x91, 0xa1, 0x07, 0x77, 0xa0, 0x7f, 0xa6, 0x2b, 0xf1, 0xfa, - 0x42, 0x6d, 0xb9, 0x42, 0xa9, 0xcb, 0x3a, 0xa0, 0xbd, 0xfe, 0x0c, 0xba, 0x4f, 0x2e, 0x49, 0xe2, - 0x88, 0x0f, 0xa1, 0x9d, 0x12, 0x9c, 0x66, 0x34, 0x27, 0x36, 0xa9, 0x61, 0x68, 0x96, 0x4b, 0xe8, - 0x96, 0x4b, 0xf8, 0xdc, 0x2d, 0x97, 0xa8, 0xc2, 0xba, 0x55, 0xb1, 0xf1, 0xea, 0xaa, 0x68, 0x5c, - 0xad, 0x8a, 0xe0, 0x10, 0x7a, 0x26, 0x98, 0xbd, 0xff, 0x2e, 0x34, 0x59, 0x29, 0x8b, 0x52, 0xea, - 0x58, 0xbd, 0xc8, 0x9e, 0xd0, 0xbb, 0xd0, 0x21, 0x97, 0x54, 0xc6, 0x89, 0x1a, 0xeb, 0x0d, 0x7d, - 0x83, 0xb6, 0x32, 0x1c, 0xb2, 0x94, 0x04, 0x7f, 0x7a, 0xd0, 0x5b, 0xee, 0x58, 0x15, 0xbb, 0xa0, - 0xa9, 0xbd, 0xa9, 0xfa, 0x7c, 0x23, 0x7f, 0xe9, 0x6d, 0x1a, 0xcb, 0x6f, 0x83, 0x42, 0xd8, 0x54, - 0x6b, 0x53, 0x2f, 0x9c, 0x37, 0x5f, 0x5b, 0xe3, 0x94, 0x66, 0x30, 0x36, 0x8f, 0x67, 0x34, 0xcb, - 0x48, 0xaa, 0xb7, 0x50, 0x3b, 0xea, 0x30, 0x36, 0xff, 0x46, 0x1b, 0x0e, 0x7e, 0xef, 0x40, 0xfb, - 0x89, 0x9d, 0x33, 0xf4, 0x33, 0x34, 0x8d, 0x38, 0xa0, 0x07, 0x75, 0x87, 0x72, 0x65, 0x15, 0x0f, - 0x1f, 0xae, 0x4b, 0xb3, 0xe5, 0xbd, 0x81, 0x04, 0x6c, 0x2a, 0x99, 0x40, 0xf7, 0xea, 0x7a, 0x58, - 0xd2, 0x98, 0xe1, 0xfd, 0xf5, 0x48, 0x55, 0xd0, 0x5f, 0xa1, 0xed, 0xa6, 0x1d, 0x3d, 0xaa, 0xeb, - 0xe3, 0x9a, 0xda, 0x0c, 0x3f, 0x5d, 0x9f, 0x58, 0x25, 0xf0, 0x9b, 0x07, 0x3b, 0xd7, 0x26, 0x1e, - 0x7d, 0x5e, 0xd7, 0xdf, 0xeb, 0x45, 0x69, 0xf8, 0xf8, 0xad, 0xf9, 0x55, 0x5a, 0xbf, 0x40, 0xcb, - 0x4a, 0x0b, 0xaa, 0x5d, 0xd1, 0x55, 0x75, 0x1a, 0x3e, 0x5a, 0x9b, 0x57, 0x45, 0xbf, 0x84, 0x2d, - 0x2d, 0x1b, 0xa8, 0x76, 0x59, 0x97, 0xa5, 0x6d, 0xf8, 0x60, 0x4d, 0x96, 0x8b, 0xbb, 0xef, 0xa9, - 0xfe, 0x37, 0xba, 0x53, 0xbf, 0xff, 0x57, 0x04, 0xad, 0x7e, 0xff, 0x5f, 0x93, 0x37, 0xdd, 0xff, - 0x6a, 0x0c, 0xeb, 0xf7, 0xff, 0x92, 0x1c, 0xd6, 0xef, 0xff, 0x65, 0x59, 0x0b, 0x6e, 0xa0, 0x3f, - 0x3c, 0xe8, 0x2b, 0xd3, 0x99, 0xe4, 0x04, 0xcf, 0x69, 0x3e, 0x41, 0x8f, 0x6b, 0x6a, 0xbb, 0x62, - 0x19, 0x7d, 0xb7, 0x4c, 0x97, 0xca, 0x17, 0x6f, 0xef, 0xc0, 0xa5, 0x35, 0xf6, 0xf6, 0xbd, 0x2f, - 0x5b, 0xdf, 0x6f, 0x19, 0x49, 0x6b, 0xea, 0x9f, 0x7b, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xd5, - 0xc9, 0x00, 0x0a, 0x93, 0x0c, 0x00, 0x00, + // 1083 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xff, 0x6e, 0x1b, 0x45, + 0x10, 0xee, 0xc5, 0x89, 0x7f, 0x8c, 0xed, 0xc4, 0x5d, 0x50, 0xb8, 0x1a, 0xa1, 0x9a, 0x43, 0xa2, + 0x16, 0x94, 0x4b, 0x94, 0xa6, 0x2d, 0x12, 0x12, 0x45, 0x4d, 0x0a, 0xaa, 0x48, 0xa3, 0xe8, 0x52, + 0xa8, 0xc4, 0x1f, 0x1c, 0x9b, 0xbb, 0xad, 0xbd, 0xca, 0xf9, 0xf6, 0xd8, 0xdd, 0x73, 0x82, 0x84, + 0xc4, 0x4b, 0x80, 0xc4, 0x03, 0xf0, 0x20, 0x3c, 0x1a, 0xda, 0x5f, 0x17, 0x3b, 0x2d, 0xd5, 0xb9, + 0x88, 0xbf, 0x7c, 0x3b, 0xfe, 0xbe, 0x99, 0xd9, 0x9d, 0x99, 0x6f, 0xe0, 0x6e, 0xca, 0xe9, 0x9c, + 0x70, 0xb1, 0x23, 0xa6, 0x98, 0x93, 0x74, 0x87, 0x5c, 0x92, 0xa4, 0x94, 0x8c, 0xef, 0x14, 0x9c, + 0x49, 0x56, 0x1d, 0x43, 0x7d, 0x44, 0x1f, 0x4f, 0xb1, 0x98, 0xd2, 0x84, 0xf1, 0x22, 0xcc, 0xd9, + 0x0c, 0xa7, 0x61, 0x91, 0x95, 0x13, 0x9a, 0x8b, 0x70, 0x19, 0x37, 0xbc, 0x3d, 0x61, 0x6c, 0x92, + 0x11, 0xe3, 0xe4, 0xac, 0x7c, 0xb9, 0x23, 0xe9, 0x8c, 0x08, 0x89, 0x67, 0x85, 0x05, 0x04, 0x96, + 0xb8, 0xe3, 0xc2, 0x9b, 0x70, 0xe6, 0x64, 0x30, 0xc1, 0xdf, 0x4d, 0xe8, 0x1f, 0xe1, 0x32, 0x4f, + 0xa6, 0x11, 0xf9, 0xb9, 0x24, 0x42, 0xa2, 0x01, 0x34, 0x92, 0x59, 0xea, 0x7b, 0x23, 0x6f, 0xdc, + 0x89, 0xd4, 0x27, 0x42, 0xb0, 0x8e, 0xf9, 0x44, 0xf8, 0x6b, 0xa3, 0xc6, 0xb8, 0x13, 0xe9, 0x6f, + 0x74, 0x0c, 0x1d, 0x4e, 0x04, 0x2b, 0x79, 0x42, 0x84, 0xdf, 0x18, 0x79, 0xe3, 0xee, 0xde, 0x6e, + 0xf8, 0x6f, 0x89, 0xdb, 0xf8, 0x26, 0x64, 0x18, 0x39, 0x5e, 0x74, 0xe5, 0x02, 0xdd, 0x86, 0xae, + 0x90, 0x29, 0x2b, 0x65, 0x5c, 0x60, 0x39, 0xf5, 0xd7, 0x75, 0x74, 0x30, 0xa6, 0x13, 0x2c, 0xa7, + 0x16, 0x40, 0x38, 0x37, 0x80, 0x8d, 0x0a, 0x40, 0x38, 0xd7, 0x80, 0x01, 0x34, 0x48, 0x3e, 0xf7, + 0x9b, 0x3a, 0x49, 0xf5, 0xa9, 0xf2, 0x2e, 0x05, 0xe1, 0x7e, 0x4b, 0x63, 0xf5, 0x37, 0xba, 0x05, + 0x6d, 0x89, 0xc5, 0x79, 0x9c, 0x52, 0xee, 0xb7, 0xb5, 0xbd, 0xa5, 0xce, 0x87, 0x94, 0xa3, 0x3b, + 0xb0, 0xe5, 0xf2, 0x89, 0x33, 0x3a, 0xa3, 0x52, 0xf8, 0x9d, 0x91, 0x37, 0x6e, 0x47, 0x9b, 0xce, + 0x7c, 0xa4, 0xad, 0x68, 0x1f, 0xde, 0x3d, 0xc3, 0x82, 0x26, 0x71, 0xc1, 0x59, 0x42, 0x84, 0x88, + 0x93, 0x09, 0x67, 0x65, 0xe1, 0x83, 0x42, 0x3f, 0x5e, 0xf3, 0xbd, 0x08, 0xe9, 0xff, 0x4f, 0xcc, + 0xdf, 0x07, 0xfa, 0x5f, 0x74, 0x08, 0xcd, 0x19, 0x2b, 0x73, 0x29, 0xfc, 0xee, 0xa8, 0x31, 0xee, + 0xee, 0xdd, 0xad, 0xf9, 0x5c, 0xcf, 0x14, 0x29, 0xb2, 0x5c, 0xf4, 0x0d, 0xb4, 0x52, 0x32, 0xa7, + 0xea, 0xd5, 0x7b, 0xda, 0xcd, 0x67, 0x35, 0xdd, 0x1c, 0x6a, 0x56, 0xe4, 0xd8, 0x68, 0x0a, 0x37, + 0x73, 0x22, 0x2f, 0x18, 0x3f, 0x8f, 0xa9, 0x60, 0x19, 0x96, 0x94, 0xe5, 0x7e, 0x5f, 0x17, 0xf2, + 0x8b, 0x9a, 0x2e, 0x8f, 0x0d, 0xff, 0xa9, 0xa3, 0x9f, 0x16, 0x24, 0x89, 0x06, 0xf9, 0x35, 0x2b, + 0x0a, 0xa0, 0x9f, 0xb3, 0xb8, 0xa0, 0x73, 0x26, 0x63, 0xce, 0x98, 0xf4, 0x37, 0xf5, 0xab, 0x76, + 0x73, 0x76, 0xa2, 0x6c, 0x11, 0x63, 0x12, 0x8d, 0x61, 0x90, 0x92, 0x97, 0xb8, 0xcc, 0x64, 0x5c, + 0xd0, 0x34, 0x9e, 0xb1, 0x94, 0xf8, 0x5b, 0xba, 0x3c, 0x9b, 0xd6, 0x7e, 0x42, 0xd3, 0x67, 0x2c, + 0x25, 0x8b, 0x48, 0x5a, 0x24, 0x06, 0x39, 0x58, 0x42, 0x3e, 0x2d, 0x12, 0x8d, 0xfc, 0x08, 0xfa, + 0x49, 0x51, 0x0a, 0x22, 0x5d, 0x7d, 0x6e, 0x6a, 0x58, 0xcf, 0x18, 0x6d, 0x55, 0x3e, 0x00, 0xc0, + 0x59, 0xc6, 0x2e, 0xe2, 0x04, 0x17, 0xc2, 0x47, 0xba, 0x79, 0x3a, 0xda, 0x72, 0x80, 0x0b, 0x81, + 0x02, 0xe8, 0x25, 0xb8, 0xc0, 0x67, 0x34, 0xa3, 0x92, 0x12, 0xe1, 0xbf, 0xa3, 0x01, 0x4b, 0xb6, + 0xe0, 0x27, 0xd8, 0x74, 0x13, 0x24, 0x0a, 0x96, 0x0b, 0x82, 0x8e, 0xa1, 0x65, 0x5b, 0x43, 0x8f, + 0x51, 0x77, 0x6f, 0x3f, 0xac, 0x37, 0xd3, 0xa1, 0x6d, 0x99, 0x53, 0x89, 0x25, 0x89, 0x9c, 0x93, + 0xa0, 0x0f, 0xdd, 0x17, 0x98, 0x4a, 0x3b, 0xa1, 0xc1, 0x8f, 0xd0, 0x33, 0xc7, 0xff, 0x29, 0xdc, + 0x11, 0x6c, 0x9d, 0x4e, 0x4b, 0x99, 0xb2, 0x8b, 0xdc, 0x89, 0xc2, 0x36, 0x34, 0x05, 0x9d, 0xe4, + 0x38, 0xb3, 0xba, 0x60, 0x4f, 0xe8, 0x43, 0xe8, 0x4d, 0x38, 0x4e, 0x48, 0x5c, 0x10, 0x4e, 0x59, + 0xea, 0xaf, 0x8d, 0xbc, 0x71, 0x23, 0xea, 0x6a, 0xdb, 0x89, 0x36, 0x05, 0x08, 0x06, 0x57, 0xde, + 0x4c, 0xc6, 0xc1, 0x14, 0xb6, 0xbf, 0x2b, 0x52, 0x15, 0xb4, 0xd2, 0x02, 0x1b, 0x68, 0x49, 0x57, + 0xbc, 0xff, 0xac, 0x2b, 0xc1, 0x2d, 0x78, 0xef, 0x95, 0x48, 0x36, 0x89, 0x01, 0x6c, 0x7e, 0x4f, + 0xb8, 0xa0, 0xcc, 0xdd, 0x32, 0xf8, 0x14, 0xb6, 0x2a, 0x8b, 0x7d, 0x5b, 0x1f, 0x5a, 0x73, 0x63, + 0xb2, 0x37, 0x77, 0xc7, 0xe0, 0x13, 0xe8, 0xa9, 0x77, 0xab, 0x32, 0x1f, 0x42, 0x9b, 0xe6, 0x92, + 0xf0, 0xb9, 0x7d, 0xa4, 0x46, 0x54, 0x9d, 0x83, 0x17, 0xd0, 0xb7, 0x58, 0xeb, 0xf6, 0x6b, 0xd8, + 0x10, 0xca, 0xb0, 0xe2, 0x15, 0x9f, 0x63, 0x71, 0x6e, 0x1c, 0x19, 0x7a, 0x70, 0x07, 0xfa, 0xa7, + 0xba, 0x12, 0xaf, 0x2f, 0xd4, 0x86, 0x2b, 0x94, 0xba, 0xac, 0x03, 0xda, 0xeb, 0x9f, 0x43, 0xf7, + 0xc9, 0x25, 0x49, 0x1c, 0xf1, 0x01, 0xb4, 0x53, 0x82, 0xd3, 0x8c, 0xe6, 0xc4, 0x26, 0x35, 0x0c, + 0xcd, 0x82, 0x09, 0xdd, 0x82, 0x09, 0x9f, 0xbb, 0x05, 0x13, 0x55, 0x58, 0xb7, 0x2e, 0xd6, 0x5e, + 0x5d, 0x17, 0x8d, 0xab, 0x75, 0x11, 0x1c, 0x40, 0xcf, 0x04, 0xb3, 0xf7, 0xdf, 0x86, 0x26, 0x2b, + 0x65, 0x51, 0x4a, 0x1d, 0xab, 0x17, 0xd9, 0x13, 0x7a, 0x1f, 0x3a, 0xe4, 0x92, 0xca, 0x38, 0x51, + 0x63, 0xbd, 0xa6, 0x6f, 0xd0, 0x56, 0x86, 0x03, 0x96, 0x92, 0xe0, 0x2f, 0x0f, 0x7a, 0x8b, 0x1d, + 0xab, 0x62, 0x17, 0x34, 0xb5, 0x37, 0x55, 0x9f, 0x6f, 0xe4, 0x2f, 0xbc, 0x4d, 0x63, 0xf1, 0x6d, + 0x50, 0x08, 0xeb, 0x6a, 0x75, 0xea, 0xa5, 0xf3, 0xe6, 0x6b, 0x6b, 0x9c, 0xd2, 0x0c, 0xc6, 0x66, + 0xf1, 0x39, 0xcd, 0x32, 0x92, 0xea, 0x4d, 0xd4, 0x8e, 0x3a, 0x8c, 0xcd, 0xbe, 0xd5, 0x86, 0xbd, + 0x3f, 0x3a, 0xd0, 0x7e, 0x62, 0xe7, 0x0c, 0xfd, 0x02, 0x4d, 0x23, 0x0e, 0xe8, 0x7e, 0xdd, 0xa1, + 0x5c, 0x5a, 0xc7, 0xc3, 0x07, 0xab, 0xd2, 0x6c, 0x79, 0x6f, 0x20, 0x01, 0xeb, 0x4a, 0x26, 0xd0, + 0xbd, 0xba, 0x1e, 0x16, 0x34, 0x66, 0xb8, 0xbf, 0x1a, 0xa9, 0x0a, 0xfa, 0x1b, 0xb4, 0xdd, 0xb4, + 0xa3, 0x87, 0x75, 0x7d, 0x5c, 0x53, 0x9b, 0xe1, 0xe7, 0xab, 0x13, 0xab, 0x04, 0x7e, 0xf7, 0x60, + 0xeb, 0xda, 0xc4, 0xa3, 0x2f, 0xeb, 0xfa, 0x7b, 0xbd, 0x28, 0x0d, 0x1f, 0xbd, 0x35, 0xbf, 0x4a, + 0xeb, 0x57, 0x68, 0x59, 0x69, 0x41, 0xb5, 0x2b, 0xba, 0xac, 0x4e, 0xc3, 0x87, 0x2b, 0xf3, 0xaa, + 0xe8, 0x97, 0xb0, 0xa1, 0x65, 0x03, 0xd5, 0x2e, 0xeb, 0xa2, 0xb4, 0x0d, 0xef, 0xaf, 0xc8, 0x72, + 0x71, 0x77, 0x3d, 0xd5, 0xff, 0x46, 0x77, 0xea, 0xf7, 0xff, 0x92, 0xa0, 0xd5, 0xef, 0xff, 0x6b, + 0xf2, 0xa6, 0xfb, 0x5f, 0x8d, 0x61, 0xfd, 0xfe, 0x5f, 0x90, 0xc3, 0xfa, 0xfd, 0xbf, 0x28, 0x6b, + 0xc1, 0x0d, 0xf4, 0xa7, 0x07, 0x7d, 0x65, 0x3a, 0x95, 0x9c, 0xe0, 0x19, 0xcd, 0x27, 0xe8, 0x51, + 0x4d, 0x6d, 0x57, 0x2c, 0xa3, 0xef, 0x96, 0xe9, 0x52, 0xf9, 0xea, 0xed, 0x1d, 0xb8, 0xb4, 0xc6, + 0xde, 0xae, 0xf7, 0xb8, 0xf5, 0xc3, 0x86, 0x91, 0xb4, 0xa6, 0xfe, 0xb9, 0xf7, 0x4f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x2d, 0xae, 0x48, 0x7d, 0x97, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/drivers/shared/executor/proto/executor.proto b/drivers/shared/executor/proto/executor.proto index c2364cfc8..55d896e71 100644 --- a/drivers/shared/executor/proto/executor.proto +++ b/drivers/shared/executor/proto/executor.proto @@ -40,7 +40,7 @@ message LaunchRequest { string user = 7; string task_dir = 8; bool resource_limits = 9; - bool basic_process_cgroup = 10; + bool basic_process_cgroup = 10 [deprecated=true]; repeated hashicorp.nomad.plugins.drivers.proto.Mount mounts = 11; repeated hashicorp.nomad.plugins.drivers.proto.Device devices = 12; hashicorp.nomad.plugins.drivers.proto.NetworkIsolationSpec network_isolation = 13; diff --git a/website/content/docs/upgrade/upgrade-specific.mdx b/website/content/docs/upgrade/upgrade-specific.mdx index 37ce9631e..071932051 100644 --- a/website/content/docs/upgrade/upgrade-specific.mdx +++ b/website/content/docs/upgrade/upgrade-specific.mdx @@ -13,6 +13,14 @@ upgrade. However, specific versions of Nomad may have more details provided for their upgrades as a result of new features or changed behavior. This page is used to document those details separately from the standard upgrade flow. +## Nomad 1.8.0 + +#### Removal of `raw_exec` option `no_cgroups` + +In Nomad 1.7.0 the `raw_exec` plugin option for `no_cgroups` became ineffective. +Starting in Nomad 1.8.0 attempting to set the `no_cgroups` in `raw_exec` plugin +configuration will result in an error when starting the agent. + ## Nomad 1.7.2 Nomad 1.7.2 fixes a critical bug in CPU fingerprinting in Nomad 1.7.0 and