Skip to content

Fix OpenSearchNode working directory to avoid executing in immutable Gradle cache directory #20229

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

Open
dbwiddis wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Fix OpenSearchNode working directory to avoid executing in immutable Gradle cache directory #20229

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix bug of warm index: FullFileCachedIndexInput was closed error ([#20055](https://github.com/opensearch-project/OpenSearch/pull/20055))
- Fix flaky test ClusterMaxMergesAtOnceIT.testClusterLevelDefaultUpdatesMergePolicy ([#18056](https://github.com/opensearch-project/OpenSearch/issues/18056))
- Fix bug in Assertion framework(Yaml Rest test): numeric comparison fails when comparing Integer vs Long (or Float vs Double) ([#19376](https://github.com/opensearch-project/OpenSearch/pull/19376))
- Fix working directory for OpenSearchNode to avoid executing in immutable Gradle cache directory ([#20229](https://github.com/opensearch-project/OpenSearch/pull/20229))

### Dependencies
- Bump `com.google.auth:google-auth-library-oauth2-http` from 1.38.0 to 1.41.0 ([#20183](https://github.com/opensearch-project/OpenSearch/pull/20183))
Expand Down
11 changes: 8 additions & 3 deletions buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,12 +725,17 @@ private void runOpenSearchBinScriptWithInput(String input, String tool, CharSequ
try (InputStream byteArrayInputStream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8))) {
LoggedExec.exec(project, spec -> {
spec.setEnvironment(getOpenSearchEnvironment());
spec.workingDir(getDistroDir());
spec.executable(OS.conditionalString().onUnix(() -> "./bin/" + tool).onWindows(() -> "cmd").supply());
spec.workingDir(workingDir.toFile());
spec.executable(
OS.conditionalString()
.onUnix(() -> getDistroDir().resolve("bin").resolve(tool).toString())
.onWindows(() -> "cmd")
.supply()
);
spec.args(OS.<List<CharSequence>>conditional().onWindows(() -> {
ArrayList<CharSequence> result = new ArrayList<>();
result.add("/c");
result.add("bin\\" + tool + ".bat");
result.add(getDistroDir().resolve("bin").resolve(tool + ".bat").toString());
result.addAll(Arrays.asList(args));
return result;
}).onUnix(() -> Arrays.asList(args)).supply());
Expand Down
Loading