Skip to content

Commit bdd979b

Browse files
Merge branch 'main' into fix-false-allow-templates-edge-case
Signed-off-by: Bruce Hong <bruce.hong@glean.com>
2 parents e350167 + 66836f0 commit bdd979b

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1919
- Fix NullPointerException in segment replicator ([#18997](https://github.com/opensearch-project/OpenSearch/pull/18997))
2020
- Ensure that plugins that utilize dumpCoverage can write to jacoco.dir when tests.security.manager is enabled ([#18983](https://github.com/opensearch-project/OpenSearch/pull/18983))
2121
- Fix OOM due to large number of shard result buffering ([#19066](https://github.com/opensearch-project/OpenSearch/pull/19066))
22+
- Fix flaky tests in CloseIndexIT by addressing cluster state synchronization issues ([#18878](https://github.com/opensearch-project/OpenSearch/issues/18878))
23+
- [Tiered Caching] Handle query execution exception ([#19000](https://github.com/opensearch-project/OpenSearch/issues/19000))
24+
- Grant access to testclusters dir for tests ([#19085](https://github.com/opensearch-project/OpenSearch/issues/19085))
2225
- Throw error when unrecognized content token type is being indexed ([#19097](https://github.com/opensearch-project/OpenSearch/pull/19097))
2326

2427
### Dependencies
@@ -35,10 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3538
### Removed
3639
- Enable backward compatibility tests on Mac ([#18983](https://github.com/opensearch-project/OpenSearch/pull/18983))
3740

38-
### Fixed
39-
- Fix flaky tests in CloseIndexIT by addressing cluster state synchronization issues ([#18878](https://github.com/opensearch-project/OpenSearch/issues/18878))
40-
- [Tiered Caching] Handle query execution exception ([#19000](https://github.com/opensearch-project/OpenSearch/issues/19000))
41-
4241
### Security
4342

4443
[Unreleased 3.x]: https://github.com/opensearch-project/OpenSearch/compare/3.1...main

test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,16 @@ public class BootstrapForTesting {
158158
false
159159
);
160160
}
161+
String testclustersDir = System.getProperty("testclusters.dir");
162+
if (testclustersDir != null) {
163+
FilePermissionUtils.addDirectoryPath(
164+
perms,
165+
"testclusters.dir",
166+
PathUtils.get(testclustersDir),
167+
"read,readlink,write,delete",
168+
false
169+
);
170+
}
161171
// custom test config file
162172
String testConfigFile = System.getProperty("tests.config");
163173
if (Strings.hasLength(testConfigFile)) {

0 commit comments

Comments
 (0)