Fix integ test failure in 2.0 RC (#942)

Signed-off-by: Govind Kamat <[email protected]>

Author: gkamat

osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options

@@ -79,6 +79,10 @@
 # ${error.file}
 {%- endif %}
 
+# JDK 21+ settings
+21-:-javaagent:agent/opensearch-agent.jar
+21-:--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
+
 {%- if additional_java_settings is defined %}
 {%- for value in additional_java_settings %}
 {{value}}

osbenchmark/utils/process.py

@@ -133,10 +133,11 @@ def run_subprocess_with_logging(command_line, header=None, level=logging.INFO, s
 
 def is_benchmark_process(p):
     cmdline = p.cmdline()
-    return p.name() == "opensearch-benchmark" or \
+    return p.name() == "opensearch-benchmark" or p.name() == "osb" or \
         (len(cmdline) > 1 and
          os.path.basename(cmdline[0].lower()).startswith("python") and
-         os.path.basename(cmdline[1]) == "opensearch-benchmark")
+         (os.path.basename(cmdline[1]) == "opensearch-benchmark" or
+          os.path.basename(cmdline[1]) == "osb"))
 
 
 def find_all_other_benchmark_processes():