*: fix code style issue

1. it's easy to check wrong input if using drain_exec_sync_io_timeout in error 2. avoid to use full error message, as part of error generated by go stdlib would be changed in the future 3. delete the extra empty line Signed-off-by: Wei Fu <[email protected]> (cherry picked from commit 5946c10) Signed-off-by: Wei Fu <[email protected]>
Mirantis · Feb 16, 2024 · aac4887 · aac4887
1 parent 2a38c7e
commit aac4887
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go
@@ -480,7 +480,7 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) ([]deprecation.W
 	// Validation for drain_exec_sync_io_timeout
 	if c.DrainExecSyncIOTimeout != "" {
 		if _, err := time.ParseDuration(c.DrainExecSyncIOTimeout); err != nil {
-			return warnings, fmt.Errorf("invalid drain exec sync io timeout: %w", err)
+			return warnings, fmt.Errorf("invalid `drain_exec_sync_io_timeout`: %w", err)
 		}
 	}
 	return warnings, nil

diff --git a/pkg/cri/config/config_test.go b/pkg/cri/config/config_test.go
@@ -474,7 +474,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/server/container_execsync.go b/pkg/cri/server/container_execsync.go
@@ -293,7 +293,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