Removing the duplicate process check based on truncated name and rely…

…ing on cmdline check (opensearch-project#553)

Signed-off-by: Prabhakar Sithanandam <prabhakar.s87@gmail.com>

osbenchmark/utils/process.py

@@ -133,12 +133,7 @@ def run_subprocess_with_logging(command_line, header=None, level=logging.INFO, s
 
 def is_benchmark_process(p):
     cmdline = p.cmdline()
-    # On Linux, /proc/PID/status truncates the command name to 15 characters which matches both opensearch-benchmark
-    # and opensearch-benchmarkd. Hence, checking command line to exclude opensearch-benchmarkd process.
     return p.name() == "opensearch-benchmark" or \
-        (p.name() == "opensearch-benc" and
-         len(cmdline) > 1 and
-         os.path.basename(cmdline[1]) != "opensearch-benchmarkd") or \
         (len(cmdline) > 1 and
          os.path.basename(cmdline[0].lower()).startswith("python") and
          os.path.basename(cmdline[1]) == "opensearch-benchmark")

tests/utils/process_test.py

@@ -124,7 +124,7 @@ def test_kills_only_benchmark_processes(self, process_iter):
         other_process = ProcessTests.Process(104, "init", ["/usr/sbin/init"])
         benchmark_process_p = ProcessTests.Process(105, "python3", ["/usr/bin/python3", "~/.local/bin/opensearch-benchmark"])
         # On Linux, the process name is truncated to 15 characters.
-        benchmark_process_l = ProcessTests.Process(106, "opensearch-benc", ["/usr/bin/python3", "~/.local/bin/osbenchmark"])
+        benchmark_process_l = ProcessTests.Process(106, "opensearch-benc", ["/usr/bin/python3", "~/.local/bin/opensearch-benchmark"])
         benchmark_process_e = ProcessTests.Process(107, "opensearch-benchmark", ["/usr/bin/python3", "~/.local/bin/opensearch-benchmark"])
         benchmark_process_mac = ProcessTests.Process(108, "Python", ["/Python.app/Contents/MacOS/Python",
                                                                      "~/.local/bin/opensearch-benchmark"])