use status manager to fetch pid when stopping workload

Author: dmjb

pkg/workloads/manager.go

@@ -266,7 +266,7 @@ func (d *defaultManager) stopRemoteWorkload(ctx context.Context, name string, ru
 
 	// Stop proxy if running
 	if runConfig.BaseName != "" {
-		d.stopProxyIfNeeded(name, runConfig.BaseName)
+		d.stopProxyIfNeeded(ctx, name, runConfig.BaseName)
 	}
 
 	// For remote workloads, we only need to clean up client configurations
@@ -497,7 +497,7 @@ func (d *defaultManager) deleteRemoteWorkload(ctx context.Context, name string,
 
 	// Stop proxy if running
 	if runConfig.BaseName != "" {
-		d.stopProxyIfNeeded(name, runConfig.BaseName)
+		d.stopProxyIfNeeded(ctx, name, runConfig.BaseName)
 	}
 
 	// Clean up associated resources
@@ -532,7 +532,7 @@ func (d *defaultManager) deleteContainerWorkload(ctx context.Context, name strin
 
 		// Stop proxy if running
 		if container.IsRunning() {
-			d.stopProxyIfNeeded(name, baseName)
+			d.stopProxyIfNeeded(ctx, name, baseName)
 		}
 
 		// Remove the container
@@ -570,14 +570,14 @@ func (d *defaultManager) getWorkloadContainer(ctx context.Context, name string)
 }
 
 // stopProcess stops the proxy process associated with the container
-func (*defaultManager) stopProcess(name string) {
+func (d *defaultManager) stopProcess(ctx context.Context, name string) {
 	if name == "" {
 		logger.Warnf("Warning: Could not find base container name in labels")
 		return
 	}
 
-	// Try to read the PID file and kill the process
-	pid, err := process.ReadPIDFile(name)
+	// Try to read the PID and kill the process
+	pid, err := d.statuses.GetWorkloadPID(ctx, name)
 	if err != nil {
 		logger.Errorf("No PID file found for %s, proxy may not be running in detached mode", name)
 		return
@@ -598,10 +598,10 @@ func (*defaultManager) stopProcess(name string) {
 }
 
 // stopProxyIfNeeded stops the proxy process if the workload has a base name
-func (d *defaultManager) stopProxyIfNeeded(name, baseName string) {
+func (d *defaultManager) stopProxyIfNeeded(ctx context.Context, name, baseName string) {
 	logger.Infof("Removing proxy process for %s...", name)
 	if baseName != "" {
-		d.stopProcess(baseName)
+		d.stopProcess(ctx, baseName)
 	}
 }
 
@@ -992,7 +992,7 @@ func (d *defaultManager) stopSingleContainerWorkload(ctx context.Context, worklo
 
 	name := labels.GetContainerBaseName(workload.Labels)
 	// Stop the proxy process
-	d.stopProcess(name)
+	d.stopProcess(ctx, name)
 	// TODO: refactor the StopProcess function to stop dealing explicitly with PID files.
 	// Note that this is not a blocker for k8s since this code path is not called there.
 	if err := d.statuses.ResetWorkloadPID(ctx, name); err != nil {

pkg/workloads/statuses/file_status.go

@@ -207,9 +207,9 @@ func (f *fileStatusManager) ListWorkloads(ctx context.Context, listAll bool, lab
 	// TODO: Fetch the runconfig if present to populate additional fields like package, tool type, group etc.
 	// There's currently an import cycle between this package and the runconfig package
 
-	for _, fileWorkload := range fileWorkloads {
-		if fileWorkload.Remote { // Remote workloads are not managed by the container runtime
-			delete(fileWorkloads, fileWorkload.Name) // Skip remote workloads here, we add them in workload manager
+	for _, fileWorkload := range fileWorkloadsWithPID {
+		if fileWorkload.workload.Remote { // Remote workloads are not managed by the container runtime
+			delete(fileWorkloadsWithPID, fileWorkload.workload.Name) // Skip remote workloads here, we add them in workload manager
 		}
 	}