Skip to content

Commit 1da3c64

Browse files
author
Igonin
committed
Merge branch 'main' into fips_compliance2
2 parents 0a4a81a + 05b1cf5 commit 1da3c64

File tree

328 files changed

+9342
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+9342
-614
lines changed

‎.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ BWC_VERSION:
4444
- "2.18.1"
4545
- "2.19.0"
4646
- "2.19.1"
47+
- "2.19.2"
4748
- "2.20.0"

‎.github/workflows/precommit.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ jobs:
99
matrix:
1010
java: [ 21, 23 ]
1111
os: [ubuntu-latest, windows-latest, macos-latest, macos-13, ubuntu-24.04-arm]
12+
include:
13+
- java: 21
14+
os: 'windows-2025'
15+
experimental: true
1216
steps:
1317
- uses: actions/checkout@v4
1418
- name: Set up JDK ${{ matrix.java }}
@@ -18,6 +22,7 @@ jobs:
1822
distribution: temurin
1923
cache: gradle
2024
- name: Run Gradle (precommit)
25+
continue-on-error: ${{ matrix.experimental }}
2126
shell: bash
2227
run: |
2328
./gradlew javadoc precommit --parallel

‎CHANGELOG-3.0.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2121
- Add execution_hint to cardinality aggregator request (#[17312](https://github.com/opensearch-project/OpenSearch/pull/17312))
2222
- Arrow Flight RPC plugin with Flight server bootstrap logic and client for internode communication ([#16962](https://github.com/opensearch-project/OpenSearch/pull/16962))
2323
- Added offset management for the pull-based Ingestion ([#17354](https://github.com/opensearch-project/OpenSearch/pull/17354))
24+
- Added integ tests for systemd configs ([#17410](https://github.com/opensearch-project/OpenSearch/pull/17410))
25+
- Add filter function for AbstractQueryBuilder, BoolQueryBuilder, ConstantScoreQueryBuilder([#17409](https://github.com/opensearch-project/OpenSearch/pull/17409))
26+
- [Star Tree] [Search] Resolving keyword & numeric bucket aggregation with metric aggregation using star-tree ([#17165](https://github.com/opensearch-project/OpenSearch/pull/17165))
27+
- Added error handling support for the pull-based ingestion ([#17427](https://github.com/opensearch-project/OpenSearch/pull/17427))
2428
- Support for FIPS-140-3 compliance through environment variable ([#3420](https://github.com/opensearch-project/OpenSearch/pull/14912))
2529

2630
### Dependencies
2731
- Update Apache Lucene to 10.1.0 ([#16366](https://github.com/opensearch-project/OpenSearch/pull/16366))
2832
- Bump Apache HttpCore5/HttpClient5 dependencies from 5.2.5/5.3.1 to 5.3.1/5.4.1 to support ExtendedSocketOption in HttpAsyncClient ([#16757](https://github.com/opensearch-project/OpenSearch/pull/16757))
2933
- Bumps `jetty` version from 9.4.55.v20240627 to 9.4.57.v20241219
34+
- Switch main/3.x to use JDK21 LTS version ([#17515](https://github.com/opensearch-project/OpenSearch/pull/17515))
3035

3136
### Changed
3237
- Changed locale provider from COMPAT to CLDR ([#14345](https://github.com/opensearch-project/OpenSearch/pull/14345))
@@ -46,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4651
- Use Lucene `BM25Similarity` as default since the `LegacyBM25Similarity` is marked as deprecated ([#17306](https://github.com/opensearch-project/OpenSearch/pull/17306))
4752
- Wildcard field index only 3gram of the input data [#17349](https://github.com/opensearch-project/OpenSearch/pull/17349)
4853
- Use BC libraries to parse PEM files, increase key length, allow general use of known cryptographic binary extensions, remove unused BC dependencies ([#3420](https://github.com/opensearch-project/OpenSearch/pull/14912))
54+
- Add optional enum set read / write functionality to stream input / output ([#17556](https://github.com/opensearch-project/OpenSearch/pull/17556))
4955

5056
### Deprecated
5157

@@ -68,6 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6874
- Remove package org.opensearch.action.support.master ([#4856](https://github.com/opensearch-project/OpenSearch/issues/4856))
6975
- Remove transport-nio plugin ([#16887](https://github.com/opensearch-project/OpenSearch/issues/16887))
7076
- Remove deprecated 'gateway' settings used to defer cluster recovery ([#3117](https://github.com/opensearch-project/OpenSearch/issues/3117))
77+
- Remove FeatureFlags.PLUGGABLE_CACHE as the feature is no longer experimental ([#17344](https://github.com/opensearch-project/OpenSearch/pull/17344))
7178

7279
### Fixed
7380
- Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))
@@ -76,6 +83,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7683
- Fix swapped field formats in nodes API where `total_indexing_buffer_in_bytes` and `total_indexing_buffer` values were reversed ([#17070](https://github.com/opensearch-project/OpenSearch/pull/17070))
7784
- Add HTTP/2 protocol support to HttpRequest.HttpVersion ([#17248](https://github.com/opensearch-project/OpenSearch/pull/17248))
7885
- Fix missing bucket in terms aggregation with missing value ([#17418](https://github.com/opensearch-project/OpenSearch/pull/17418))
86+
- Fix explain action on query rewrite ([#17286](https://github.com/opensearch-project/OpenSearch/pull/17286))
7987

8088
### Security
8189

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Introduce a setting to disable download of full cluster state from remote on term mismatch([#16798](https://github.com/opensearch-project/OpenSearch/pull/16798/))
1212
- Added ability to retrieve value from DocValues in a flat_object filed([#16802](https://github.com/opensearch-project/OpenSearch/pull/16802))
1313
- Improve performace of NumericTermAggregation by avoiding unnecessary sorting([#17252](https://github.com/opensearch-project/OpenSearch/pull/17252))
14+
- Fix Bug - Handle unsigned long in sorting order assertion of LongHashSet ([#17207](https://github.com/opensearch-project/OpenSearch/pull/17207))
1415
- Implemented computation of segment replication stats at shard level ([#17055](https://github.com/opensearch-project/OpenSearch/pull/17055))
1516
- [Rule Based Auto-tagging] Add in-memory attribute value store ([#17342](https://github.com/opensearch-project/OpenSearch/pull/17342))
1617

@@ -25,6 +26,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2526
- Bump `com.google.api.grpc:proto-google-common-protos` from 2.37.1 to 2.52.0 ([#17379](https://github.com/opensearch-project/OpenSearch/pull/17379))
2627
- Bump `net.minidev:json-smart` from 2.5.1 to 2.5.2 ([#17378](https://github.com/opensearch-project/OpenSearch/pull/17378))
2728
- Bump `com.netflix.nebula.ospackage-base` from 11.10.1 to 11.11.1 ([#17374](https://github.com/opensearch-project/OpenSearch/pull/17374))
29+
- Bump `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17 ([#17497](https://github.com/opensearch-project/OpenSearch/pull/17497))
30+
- Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396))
31+
- Bump `org.jruby.jcodings:jcodings` from 1.0.61 to 1.0.63 ([#17560](https://github.com/opensearch-project/OpenSearch/pull/17560))
32+
- Bump `com.azure:azure-storage-blob` from 12.28.1 to 12.29.1 ([#17562](https://github.com/opensearch-project/OpenSearch/pull/17562))
2833

2934
### Changed
3035
- Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233)
@@ -36,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3641
### Removed
3742

3843
### Fixed
44+
- Fix visit of inner query for FunctionScoreQueryBuilder ([#16776](https://github.com/opensearch-project/OpenSearch/pull/16776))
3945
- Fix case insensitive and escaped query on wildcard ([#16827](https://github.com/opensearch-project/OpenSearch/pull/16827))
4046
- Fix exists queries on nested flat_object fields throws exception ([#16803](https://github.com/opensearch-project/OpenSearch/pull/16803))
4147
- Add highlighting for wildcard search on `match_only_text` field ([#17101](https://github.com/opensearch-project/OpenSearch/pull/17101))

‎DEVELOPER_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ All distributions built will be under `distributions/archives`.
127127
#### Generated Code
128128

129129
OpenSearch uses code generators like [Protobuf](https://protobuf.dev/).
130-
OpenSearch build system already takes a dependency of generating code from protobuf, incase you run into compilation errors, run:
130+
OpenSearch build system already takes a dependency of generating code from protobuf, if you run into compilation errors, run:
131131

132132
```
133133
./gradlew generateProto

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Security Vulnerabilities](https://img.shields.io/github/issues/opensearch-project/OpenSearch/security%20vulnerability?labelColor=red)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"security%20vulnerability")
88
[![Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch)](https://github.com/opensearch-project/OpenSearch/issues)
99
[![Open Pull Requests](https://img.shields.io/github/issues-pr/opensearch-project/OpenSearch)](https://github.com/opensearch-project/OpenSearch/pulls)
10-
[![2.19.1 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.19.1)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.19.1")
10+
[![2.19.2 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.19.2)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.19.2")
1111
[![2.18.1 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v2.18.1)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v2.18.1")
1212
[![3.0.0 Open Issues](https://img.shields.io/github/issues/opensearch-project/OpenSearch/v3.0.0)](https://github.com/opensearch-project/OpenSearch/issues?q=is%3Aissue+is%3Aopen+label%3A"v3.0.0")
1313
[![GHA gradle check](https://github.com/opensearch-project/OpenSearch/actions/workflows/gradle-check.yml/badge.svg)](https://github.com/opensearch-project/OpenSearch/actions/workflows/gradle-check.yml)

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ subprojects {
736736
reporting {
737737
reports {
738738
testAggregateTestReport(AggregateTestReport) {
739-
testType = TestSuiteType.UNIT_TEST
739+
testSuiteName = "test"
740740
}
741741
}
742742
}

‎buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
import java.util.stream.Stream;
7878

7979
public class DistroTestPlugin implements Plugin<Project> {
80-
private static final String SYSTEM_JDK_VERSION = "23.0.2+7";
80+
private static final String SYSTEM_JDK_VERSION = "21.0.6+7";
8181
private static final String SYSTEM_JDK_VENDOR = "adoptium";
82-
private static final String GRADLE_JDK_VERSION = "23.0.2+7";
82+
private static final String GRADLE_JDK_VERSION = "21.0.6+7";
8383
private static final String GRADLE_JDK_VENDOR = "adoptium";
8484

8585
// all distributions used by distro tests. this is temporary until tests are per distribution

‎distribution/src/config/opensearch.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ ${path.logs}
122122
#
123123
#opensearch.experimental.optimization.datetime_formatter_caching.enabled: false
124124
#
125-
# Gates the functionality of enabling Opensearch to use pluggable caches with respective store names via setting.
126-
#
127-
#opensearch.experimental.feature.pluggable.caching.enabled: false
128-
#
129125
# Gates the functionality of star tree index, which improves the performance of search aggregations.
130126
#
131127
#opensearch.experimental.feature.composite_index.star_tree.enabled: true

‎gradle/code-coverage.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (System.getProperty("tests.coverage")) {
3838
reporting {
3939
reports {
4040
testCodeCoverageReport(JacocoCoverageReport) {
41-
testType = TestSuiteType.UNIT_TEST
41+
testSuiteName = "test"
4242
}
4343
}
4444
}

‎gradle/libs.versions.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ opensearch = "3.0.0"
33
lucene = "10.1.0"
44

55
bundled_jdk_vendor = "adoptium"
6-
bundled_jdk = "23.0.2+7"
6+
bundled_jdk = "21.0.6+7"
77

88
# optional dependencies
99
spatial4j = "0.7"
@@ -28,6 +28,7 @@ google_auth = "1.29.0"
2828
tdigest = "3.3"
2929
hdrhistogram = "2.2.2"
3030
grpc = "1.68.2"
31+
json_smart = "2.5.2"
3132

3233
# when updating the JNA version, also update the version in buildSrc/build.gradle
3334
jna = "5.13.0"
@@ -52,7 +53,8 @@ commonslang = "3.14.0"
5253
commonscompress = "1.26.1"
5354
commonsio = "2.16.0"
5455
# plugin dependencies
55-
aws = "2.20.86"
56+
aws = "2.30.31"
57+
awscrt = "0.35.0"
5658
reactivestreams = "1.0.4"
5759

5860
# when updating this version, you need to ensure compatibility with:

‎gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
distributionBase=GRADLE_USER_HOME
1313
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
14+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
1515
zipStoreBase=GRADLE_USER_HOME
1616
zipStorePath=wrapper/dists
17-
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
17+
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612

‎gradlew

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.

‎libs/core/src/main/java/org/opensearch/Version.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
115115
public static final Version V_2_18_1 = new Version(2180199, org.apache.lucene.util.Version.LUCENE_9_12_1);
116116
public static final Version V_2_19_0 = new Version(2190099, org.apache.lucene.util.Version.LUCENE_9_12_1);
117117
public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
118+
public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
118119
public static final Version V_2_20_0 = new Version(2200099, org.apache.lucene.util.Version.LUCENE_9_12_1);
119120
public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
120121
public static final Version CURRENT = V_3_0_0;

‎libs/core/src/main/java/org/opensearch/core/common/io/stream/StreamInput.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,6 +1305,21 @@ public <E extends Enum<E>> EnumSet<E> readEnumSet(Class<E> enumClass) throws IOE
13051305
return res;
13061306
}
13071307

1308+
/**
1309+
* Reads an optional enum set with type E that was serialized based on the value of each enum's ordinal
1310+
* The set is expected to have been written using {@link StreamOutput#writeOptionalEnumSet(EnumSet)}
1311+
*
1312+
* @return the enum set of strings
1313+
* @throws IOException if an I/O exception occurs reading the set
1314+
*/
1315+
public <E extends Enum<E>> EnumSet<E> readOptionalEnumSet(Class<E> enumClass) throws IOException {
1316+
if (readBoolean()) {
1317+
return readEnumSet(enumClass);
1318+
} else {
1319+
return EnumSet.noneOf(enumClass);
1320+
}
1321+
}
1322+
13081323
public static StreamInput wrap(byte[] bytes) {
13091324
return wrap(bytes, 0, bytes.length);
13101325
}

‎libs/core/src/main/java/org/opensearch/core/common/io/stream/StreamOutput.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,19 @@ public <E extends Enum<E>> void writeEnumSet(EnumSet<E> enumSet) throws IOExcept
12551255
}
12561256
}
12571257

1258+
/**
1259+
* Writes an optional EnumSet with type E that serializes each enum based on its ordinal value
1260+
* For null or empty enum set, writes false;
1261+
*/
1262+
public <E extends Enum<E>> void writeOptionalEnumSet(@Nullable EnumSet<E> enumSet) throws IOException {
1263+
if (enumSet != null && enumSet.size() > 0) {
1264+
writeBoolean(true);
1265+
writeEnumSet(enumSet);
1266+
} else {
1267+
writeBoolean(false);
1268+
}
1269+
}
1270+
12581271
/**
12591272
* Write a {@link TimeValue} to the stream
12601273
*/

‎libs/core/src/test/java/org/opensearch/core/common/io/stream/BaseStreamTests.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import java.util.Arrays;
5454
import java.util.Collection;
5555
import java.util.Collections;
56+
import java.util.EnumSet;
5657
import java.util.HashMap;
5758
import java.util.HashSet;
5859
import java.util.LinkedHashMap;
@@ -354,6 +355,32 @@ private <T> void runWriteReadCollectionTest(
354355
}
355356
}
356357

358+
public void testOptionalEnumSet() throws IOException {
359+
EnumSet<TestEnum> enumSet = EnumSet.allOf(TestEnum.class);
360+
BytesStreamOutput out = new BytesStreamOutput();
361+
out.writeOptionalEnumSet(enumSet);
362+
EnumSet<TestEnum> targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
363+
assertEquals(enumSet, targetSet);
364+
365+
enumSet = EnumSet.of(TestEnum.A, TestEnum.C, TestEnum.E);
366+
out = new BytesStreamOutput();
367+
out.writeOptionalEnumSet(enumSet);
368+
targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
369+
assertEquals(enumSet, targetSet);
370+
371+
enumSet = EnumSet.noneOf(TestEnum.class);
372+
out = new BytesStreamOutput();
373+
out.writeOptionalEnumSet(enumSet);
374+
targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
375+
assertEquals(enumSet, targetSet);
376+
377+
enumSet = null;
378+
out = new BytesStreamOutput();
379+
out.writeOptionalEnumSet(enumSet);
380+
targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
381+
assertEquals(EnumSet.noneOf(TestEnum.class), targetSet);
382+
}
383+
357384
public void testSetOfLongs() throws IOException {
358385
final int size = randomIntBetween(0, 6);
359386
final Set<Long> sourceSet = new HashSet<>(size);
@@ -540,4 +567,11 @@ private void assertGenericRoundtrip(Object original) throws IOException {
540567
});
541568
}
542569

570+
private enum TestEnum {
571+
A,
572+
B,
573+
C,
574+
D,
575+
E;
576+
}
543577
}

‎libs/grok/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
dependencies {
3232
api 'org.jruby.joni:joni:2.2.3'
3333
// joni dependencies:
34-
api 'org.jruby.jcodings:jcodings:1.0.61'
34+
api 'org.jruby.jcodings:jcodings:1.0.63'
3535

3636
testImplementation(project(":test:framework")) {
3737
exclude group: 'org.opensearch', module: 'opensearch-grok'

‎libs/grok/licenses/jcodings-1.0.61.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎libs/grok/licenses/jcodings-1.0.63.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b8c386790e72f0bad666c8f1a8af12d0528992e0

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheBaseIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
import org.opensearch.common.cache.settings.CacheSettings;
1313
import org.opensearch.common.cache.store.OpenSearchOnHeapCache;
1414
import org.opensearch.common.settings.Settings;
15-
import org.opensearch.common.util.FeatureFlags;
1615
import org.opensearch.test.OpenSearchIntegTestCase;
1716

1817
public class TieredSpilloverCacheBaseIT extends OpenSearchIntegTestCase {
1918

2019
public Settings defaultSettings(String onHeapCacheSizeInBytesOrPercentage, int numberOfSegments) {
2120
return Settings.builder()
22-
.put(FeatureFlags.PLUGGABLE_CACHE, "true")
2321
.put(
2422
CacheSettings.getConcreteStoreNameSettingForCacheType(CacheType.INDICES_REQUEST_CACHE).getKey(),
2523
TieredSpilloverCache.TieredSpilloverCacheFactory.TIERED_SPILLOVER_CACHE_NAME

‎modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCachePlugin.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.opensearch.common.cache.ICache;
1313
import org.opensearch.common.settings.Setting;
1414
import org.opensearch.common.settings.Settings;
15-
import org.opensearch.common.util.FeatureFlags;
1615
import org.opensearch.plugins.CachePlugin;
1716
import org.opensearch.plugins.Plugin;
1817

@@ -64,9 +63,7 @@ public List<Setting<?>> getSettings() {
6463
);
6564
settingList.add(TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP.get(cacheType));
6665
settingList.add(TOOK_TIME_DISK_TIER_POLICY_CONCRETE_SETTINGS_MAP.get(cacheType));
67-
if (FeatureFlags.PLUGGABLE_CACHE_SETTING.get(settings)) {
68-
settingList.add(DISK_CACHE_ENABLED_SETTING_MAP.get(cacheType));
69-
}
66+
settingList.add(DISK_CACHE_ENABLED_SETTING_MAP.get(cacheType));
7067
settingList.add(
7168
TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS.getConcreteSettingForNamespace(cacheType.getSettingPrefix())
7269
);

0 commit comments

Comments
 (0)