Skip to content

Commit 5c8df2c

Browse files
committed
Changing variable name from settings to clusterSettings
Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
1 parent 6f9f0c3 commit 5c8df2c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@
4343
public class RemoteMigrationIndexMetadataUpdater {
4444
private final DiscoveryNodes discoveryNodes;
4545
private final RoutingTable routingTable;
46-
private final Settings settings;
46+
private final Settings clusterSettings;
4747
private final IndexMetadata indexMetadata;
4848
private final Logger logger;
4949

5050
public RemoteMigrationIndexMetadataUpdater(
5151
DiscoveryNodes discoveryNodes,
5252
RoutingTable routingTable,
5353
IndexMetadata indexMetadata,
54-
Settings settings,
54+
Settings clusterSettings,
5555
Logger logger
5656

5757
) {
5858
this.discoveryNodes = discoveryNodes;
5959
this.routingTable = routingTable;
60-
this.settings = settings;
60+
this.clusterSettings = clusterSettings;
6161
this.indexMetadata = indexMetadata;
6262
this.logger = logger;
6363
}
@@ -134,7 +134,7 @@ private boolean needsRemoteIndexSettingsUpdate(
134134
public void maybeUpdateRemoteStorePathStrategy(IndexMetadata.Builder indexMetadataBuilder, String index) {
135135
if (indexHasRemotePathMetadata(indexMetadata) == false) {
136136
logger.info("Adding remote store path strategy for index [{}] during migration", index);
137-
indexMetadataBuilder.putCustom(REMOTE_STORE_CUSTOM_KEY, createRemoteStorePathTypeMetadata(settings, discoveryNodes));
137+
indexMetadataBuilder.putCustom(REMOTE_STORE_CUSTOM_KEY, createRemoteStorePathTypeMetadata(clusterSettings, discoveryNodes));
138138
} else {
139139
logger.debug("Index {} already has remote store path strategy", index);
140140
}
@@ -143,18 +143,18 @@ public void maybeUpdateRemoteStorePathStrategy(IndexMetadata.Builder indexMetada
143143
/**
144144
* Generates the remote store path type information to be added to custom data of index metadata.
145145
*
146-
* @param settings Current Cluster settings from {@link ClusterState}
146+
* @param clusterSettings Current Cluster settings from {@link ClusterState}
147147
* @param discoveryNodes Current {@link DiscoveryNodes} from the cluster state
148148
* @return {@link Map} to be added as custom data in index metadata
149149
*/
150-
private Map<String, String> createRemoteStorePathTypeMetadata(Settings settings, DiscoveryNodes discoveryNodes) {
150+
private Map<String, String> createRemoteStorePathTypeMetadata(Settings clusterSettings, DiscoveryNodes discoveryNodes) {
151151
Version minNodeVersion = discoveryNodes.getMinNodeVersion();
152152
PathType pathType = Version.CURRENT.compareTo(minNodeVersion) <= 0
153-
? CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.get(settings)
153+
? CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING.get(clusterSettings)
154154
: PathType.FIXED;
155155
PathHashAlgorithm pathHashAlgorithm = pathType == PathType.FIXED
156156
? null
157-
: CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING.get(settings);
157+
: CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING.get(clusterSettings);
158158
Map<String, String> remoteCustomData = new HashMap<>();
159159
remoteCustomData.put(PathType.NAME, pathType.name());
160160
if (Objects.nonNull(pathHashAlgorithm)) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testMaybeAddRemoteIndexSettingsAllPrimariesAndReplicasOnRemote() thr
5555
allNodes,
5656
routingTable,
5757
existingIndexMetadata,
58-
existingIndexMetadata.getSettings(),
58+
metadata.settings(),
5959
logger
6060
);
6161
migrationIndexMetadataUpdater.maybeAddRemoteIndexSettings(indexMetadataBuilder, indexName, segmentRepoName, tlogRepoName);
@@ -76,7 +76,7 @@ public void testMaybeAddRemoteIndexSettingsDoesNotRunWhenSettingsAlreadyPresent(
7676
allNodes,
7777
routingTable,
7878
existingIndexMetadata,
79-
existingIndexMetadata.getSettings(),
79+
metadata.settings(),
8080
logger
8181
);
8282
migrationIndexMetadataUpdater.maybeAddRemoteIndexSettings(indexMetadataBuilder, indexName, segmentRepoName, tlogRepoName);
@@ -96,7 +96,7 @@ public void testMaybeAddRemoteIndexSettingsDoesNotUpdateSettingsWhenAllShardsInD
9696
allNodes,
9797
routingTable,
9898
existingIndexMetadata,
99-
existingIndexMetadata.getSettings(),
99+
metadata.settings(),
100100
logger
101101
);
102102
migrationIndexMetadataUpdater.maybeAddRemoteIndexSettings(indexMetadataBuilder, indexName, segmentRepoName, tlogRepoName);
@@ -117,7 +117,7 @@ public void testMaybeAddRemoteIndexSettingsUpdatesIndexSettingsWithUnassignedRep
117117
allNodes,
118118
routingTable,
119119
existingIndexMetadata,
120-
existingIndexMetadata.getSettings(),
120+
metadata.settings(),
121121
logger
122122
);
123123
migrationIndexMetadataUpdater.maybeAddRemoteIndexSettings(indexMetadataBuilder, indexName, segmentRepoName, tlogRepoName);
@@ -139,7 +139,7 @@ public void testMaybeAddRemoteIndexSettingsDoesNotUpdateIndexSettingsWithRelocat
139139
allNodes,
140140
routingTable,
141141
existingIndexMetadata,
142-
existingIndexMetadata.getSettings(),
142+
metadata.settings(),
143143
logger
144144
);
145145
migrationIndexMetadataUpdater.maybeAddRemoteIndexSettings(indexMetadataBuilder, indexName, segmentRepoName, tlogRepoName);

0 commit comments

Comments
 (0)