Skip to content

Fix integ test failure in 2.0 RC #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2025
Merged

Fix integ test failure in 2.0 RC #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...rk/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
5 changes: 3 additions & 2 deletions osbenchmark/utils/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
Loading