Skip to content

Commit a47e123

Browse files
authored
[Remote Store] Update version to 2.14 in path type check (opensearch-project#13436)
Signed-off-by: Ashish Singh <ssashish@amazon.com>
1 parent 78087ac commit a47e123

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

server/src/main/java/org/opensearch/index/remote/RemoteStorePathStrategyResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public RemoteStorePathStrategy get() {
3636
PathType pathType;
3737
PathHashAlgorithm pathHashAlgorithm;
3838
// Min node version check ensures that we are enabling the new prefix type only when all the nodes understand it.
39-
pathType = Version.CURRENT.compareTo(minNodeVersionSupplier.get()) <= 0 ? remoteStoreSettings.getPathType() : PathType.FIXED;
39+
pathType = Version.V_2_14_0.compareTo(minNodeVersionSupplier.get()) <= 0 ? remoteStoreSettings.getPathType() : PathType.FIXED;
4040
// If the path type is fixed, hash algorithm is not applicable.
4141
pathHashAlgorithm = pathType == PathType.FIXED ? null : remoteStoreSettings.getPathHashAlgorithm();
4242
return new RemoteStorePathStrategy(pathType, pathHashAlgorithm);

server/src/test/java/org/opensearch/index/remote/RemoteStorePathStrategyResolverTests.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void testGetMinVersionNewer() {
3535
Settings settings = Settings.builder().put(CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.getKey(), pathType).build();
3636
ClusterSettings clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
3737
RemoteStoreSettings remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
38-
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
38+
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
3939
assertEquals(pathType, resolver.get().getType());
4040
if (pathType.requiresHashAlgorithm()) {
4141
assertNotNull(resolver.get().getHashAlgorithm());
@@ -49,7 +49,7 @@ public void testGetStrategy() {
4949
Settings settings = Settings.builder().put(CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.getKey(), PathType.FIXED).build();
5050
ClusterSettings clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
5151
RemoteStoreSettings remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
52-
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
52+
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
5353
assertEquals(PathType.FIXED, resolver.get().getType());
5454

5555
// FIXED type with hash algorithm
@@ -59,22 +59,22 @@ public void testGetStrategy() {
5959
.build();
6060
clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
6161
remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
62-
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
62+
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
6363
assertEquals(PathType.FIXED, resolver.get().getType());
6464

6565
// HASHED_PREFIX type with FNV_1A_COMPOSITE
6666
settings = Settings.builder().put(CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.getKey(), PathType.HASHED_PREFIX).build();
6767
clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
6868
remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
69-
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
69+
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
7070
assertEquals(PathType.HASHED_PREFIX, resolver.get().getType());
7171
assertEquals(PathHashAlgorithm.FNV_1A_COMPOSITE_1, resolver.get().getHashAlgorithm());
7272

7373
// HASHED_PREFIX type with FNV_1A_COMPOSITE
7474
settings = Settings.builder().put(CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.getKey(), PathType.HASHED_PREFIX).build();
7575
clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
7676
remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
77-
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
77+
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
7878
assertEquals(PathType.HASHED_PREFIX, resolver.get().getType());
7979
assertEquals(PathHashAlgorithm.FNV_1A_COMPOSITE_1, resolver.get().getHashAlgorithm());
8080

@@ -85,7 +85,7 @@ public void testGetStrategy() {
8585
.build();
8686
clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
8787
remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
88-
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
88+
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
8989
assertEquals(PathType.HASHED_PREFIX, resolver.get().getType());
9090
assertEquals(PathHashAlgorithm.FNV_1A_BASE64, resolver.get().getHashAlgorithm());
9191

@@ -96,7 +96,7 @@ public void testGetStrategy() {
9696
.build();
9797
clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
9898
remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
99-
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
99+
resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
100100
assertEquals(PathType.HASHED_PREFIX, resolver.get().getType());
101101
assertEquals(PathHashAlgorithm.FNV_1A_BASE64, resolver.get().getHashAlgorithm());
102102
}
@@ -107,7 +107,7 @@ public void testGetStrategyWithDynamicUpdate() {
107107
Settings settings = Settings.builder().build();
108108
ClusterSettings clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
109109
RemoteStoreSettings remoteStoreSettings = new RemoteStoreSettings(settings, clusterSettings);
110-
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.CURRENT);
110+
RemoteStorePathStrategyResolver resolver = new RemoteStorePathStrategyResolver(remoteStoreSettings, () -> Version.V_2_14_0);
111111
assertEquals(PathType.FIXED, resolver.get().getType());
112112
assertNull(resolver.get().getHashAlgorithm());
113113

0 commit comments

Comments
 (0)