diff --git a/.changelog/24265.txt b/.changelog/24265.txt new file mode 100644 index 00000000000..6beab466876 --- /dev/null +++ b/.changelog/24265.txt @@ -0,0 +1,3 @@ +```release-note:bug +deps: Fixed a bug where restarting Nomad could cause an unrelated process with the same PID as a failed executor to be killed +``` diff --git a/go.mod b/go.mod index 822fa49058f..80d6eca5c24 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/hashicorp/go-msgpack/v2 v2.1.2 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-netaddrs v0.1.0 - github.com/hashicorp/go-plugin v1.6.1 + github.com/hashicorp/go-plugin v1.6.2 github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 github.com/hashicorp/go-set/v3 v3.0.0-alpha.1 diff --git a/go.sum b/go.sum index 904101d4a33..1da0bbdba87 100644 --- a/go.sum +++ b/go.sum @@ -689,8 +689,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-netaddrs v0.1.0 h1:TnlYvODD4C/wO+j7cX1z69kV5gOzI87u3OcUinANaW8= github.com/hashicorp/go-netaddrs v0.1.0/go.mod h1:33+a/emi5R5dqRspOuZKO0E+Tuz5WV1F84eRWALkedA= -github.com/hashicorp/go-plugin v1.6.1 h1:P7MR2UP6gNKGPp+y7EZw2kOiq4IR9WiqLvp0XOsVdwI= -github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= +github.com/hashicorp/go-plugin v1.6.2 h1:zdGAEd0V1lCaU0u+MxWQhtSDQmahpkwOun8U8EiRVog= +github.com/hashicorp/go-plugin v1.6.2/go.mod h1:CkgLQ5CZqNmdL9U9JzM532t8ZiYQ35+pj3b1FD37R0Q= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= diff --git a/plugins/drivers/testutils/testing.go b/plugins/drivers/testutils/testing.go index adb4521e9cd..8a363cd0ed5 100644 --- a/plugins/drivers/testutils/testing.go +++ b/plugins/drivers/testutils/testing.go @@ -9,6 +9,7 @@ import ( "os" "path/filepath" "runtime" + "testing" "time" hclog "github.com/hashicorp/go-hclog" @@ -25,7 +26,6 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/fsisolation" "github.com/hashicorp/nomad/plugins/shared/hclspec" - testing "github.com/mitchellh/go-testing-interface" "github.com/shoenig/test/must" ) @@ -33,7 +33,7 @@ type DriverHarness struct { drivers.DriverPlugin client *plugin.GRPCClient server *plugin.GRPCServer - t testing.T + t *testing.T logger hclog.Logger impl drivers.DriverPlugin cgroup string @@ -42,7 +42,7 @@ type DriverHarness struct { func (h *DriverHarness) Impl() drivers.DriverPlugin { return h.impl } -func NewDriverHarness(t testing.T, d drivers.DriverPlugin) *DriverHarness { +func NewDriverHarness(t *testing.T, d drivers.DriverPlugin) *DriverHarness { logger := testlog.HCLogger(t).Named("driver_harness") pd := drivers.NewDriverPlugin(d, logger)