diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go index 7f0403c30..ad16bbe20 100644 --- a/pkg/cri/config/config.go +++ b/pkg/cri/config/config.go @@ -522,7 +522,7 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) error { // Validation for drain_exec_sync_io_timeout if c.DrainExecSyncIOTimeout != "" { if _, err := time.ParseDuration(c.DrainExecSyncIOTimeout); err != nil { - return fmt.Errorf("invalid drain exec sync io timeout: %w", err) + return fmt.Errorf("invalid `drain_exec_sync_io_timeout`: %w", err) } } return nil diff --git a/pkg/cri/config/config_test.go b/pkg/cri/config/config_test.go index 620d4906c..4c2a80419 100644 --- a/pkg/cri/config/config_test.go +++ b/pkg/cri/config/config_test.go @@ -395,7 +395,7 @@ func TestValidateConfig(t *testing.T) { }, DrainExecSyncIOTimeout: "10", }, - expectedErr: "invalid drain exec sync io timeout: time: missing unit in duration \"10\"", + expectedErr: "invalid `drain_exec_sync_io_timeout`", }, } { t.Run(desc, func(t *testing.T) { diff --git a/pkg/cri/sbserver/container_execsync.go b/pkg/cri/sbserver/container_execsync.go index cd67037ac..3e4090f3e 100644 --- a/pkg/cri/sbserver/container_execsync.go +++ b/pkg/cri/sbserver/container_execsync.go @@ -290,7 +290,6 @@ func drainExecSyncIO(ctx context.Context, execProcess containerd.Process, drainE select { case <-timerCh: - case <-attachDone: log.G(ctx).Debugf("Stream pipe for exec process %q done", execProcess.ID()) return nil diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 63ba72512..23885471e 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -290,7 +290,6 @@ func drainExecSyncIO(ctx context.Context, execProcess containerd.Process, drainE select { case <-timerCh: - case <-attachDone: log.G(ctx).Debugf("Stream pipe for exec process %q done", execProcess.ID()) return nil