Merge 7fcc172 into 49e38f5

redhat-developer · Aug 1, 2023 · 3128294 · 3128294
2 parents 49e38f5 + 7fcc172
commit 3128294
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/pkg/remotecmd/kubeexec.go b/pkg/remotecmd/kubeexec.go
@@ -145,13 +145,6 @@ func (k *kubeExecProcessHandler) StartProcessForCommand(ctx context.Context, def
 // Then killing those children will exit the parent 'sh' process.
 func (k *kubeExecProcessHandler) StopProcessForCommand(ctx context.Context, def CommandDefinition, podName string, containerName string) error {
 	klog.V(4).Infof("StopProcessForCommand for %q", def.Id)
-	defer func() {
-		pidFile := getPidFileForCommand(def)
-		_, _, err := k.execClient.ExecuteCommand(ctx, []string{ShellExecutable, "-c", fmt.Sprintf("rm -f %s", pidFile)}, podName, containerName, false, nil, nil)
-		if err != nil {
-			klog.V(2).Infof("Could not remove file %q: %v", pidFile, err)
-		}
-	}()
 
 	kill := func(p int) error {
 		_, _, err := k.execClient.ExecuteCommand(ctx, []string{ShellExecutable, "-c", fmt.Sprintf("kill %d || true", p)}, podName, containerName, false, nil, nil)
@@ -181,6 +174,12 @@ func (k *kubeExecProcessHandler) StopProcessForCommand(ctx context.Context, def
 		return nil
 	}
 
+	pidFile := getPidFileForCommand(def)
+	_, _, err := k.execClient.ExecuteCommand(ctx, []string{ShellExecutable, "-c", fmt.Sprintf("rm -f %s", pidFile)}, podName, containerName, false, nil, nil)
+	if err != nil {
+		klog.V(2).Infof("Could not remove file %q: %v", pidFile, err)
+	}
+
 	ppid, _, err := k.getRemoteProcessPID(ctx, def, podName, containerName)
 	if err != nil {
 		return err