Fixed the zombie problem

Author: henricasanova

bin/wfbench

@@ -52,9 +52,11 @@ def kill_process_and_children(proc):
         for child in children:
             child.kill()
         parent.kill()
+
     except psutil.NoSuchProcess:
         pass # Process is already dead
 
+
 def log_info(msg: str):
     """
     Log an info message to stderr
@@ -213,7 +215,7 @@ def cpu_mem_benchmark(cpu_queue: multiprocessing.Queue,
         if core:
             os.sched_setaffinity(mem_proc.pid, {core})
 
-    return cpu_proc, mem_proc
+    return [cpu_proc, mem_proc]
 
 
 def io_read_benchmark_user_input_data_size(inputs,
@@ -467,7 +469,7 @@ def main():
             log_debug(f"{args.name} acquired core {core}")
 
         mem_threads=int(10 - 10 * args.percent_cpu)
-        cpu_proc, mem_proc = cpu_mem_benchmark(cpu_queue=cpu_queue, 
+        [cpu_proc, mem_proc] = cpu_mem_benchmark(cpu_queue=cpu_queue,
                                                  cpu_threads=int(10 * args.percent_cpu),
                                                  mem_threads=mem_threads,
                                                  cpu_work=int32_max**2 if args.time else int(args.cpu_work),

tests/test_helpers.py

@@ -90,7 +90,8 @@ def _start_docker_container(backend, mounted_dir, working_dir, bin_dir, command=
         working_dir=working_dir,
         user="wfcommons",
         tty=True,
-        detach=True
+        detach=True,
+        init=True  # For zombies
     )
 
     # Installing WfCommons on container
@@ -165,4 +166,4 @@ def _compare_workflows(workflow_1: Workflow, workflow_2: Workflow):
             # sys.stderr.write(f"WORKFLOW2 OUTPUT FILE: {output_file.file_id} {output_file.size}\n")
             workflow2_output_bytes += output_file.size
     assert (workflow1_input_bytes == workflow2_input_bytes)
-    assert (workflow1_output_bytes == workflow2_output_bytes)
+    assert (workflow1_output_bytes == workflow2_output_bytes)