Renaming the node role search to warm (opensearch-project#17573)

* Renaming search node role to warm

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Added Changelog

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* fixed failing tests

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* fixed PR comments

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

---------

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

Author: vinaykpud

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 2.x]
 ### Added
-
+- Renaming the node role search to warm ([#17573](https://github.com/opensearch-project/OpenSearch/pull/17573))
 ### Dependencies
 - Bump `netty` from 4.1.118.Final to 4.1.121.Final ([#18192](https://github.com/opensearch-project/OpenSearch/pull/18192))
 

server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/stats/ClusterStatsIT.java

@@ -896,7 +896,7 @@ private Map<String, Integer> getExpectedCounts(
         expectedCounts.put(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE.roleName(), clusterManagerRoleCount);
         expectedCounts.put(DiscoveryNodeRole.INGEST_ROLE.roleName(), ingestRoleCount);
         expectedCounts.put(DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE.roleName(), remoteClusterClientRoleCount);
-        expectedCounts.put(DiscoveryNodeRole.SEARCH_ROLE.roleName(), searchRoleCount);
+        expectedCounts.put(DiscoveryNodeRole.WARM_ROLE.roleName(), searchRoleCount);
         expectedCounts.put(ClusterStatsNodes.Counts.COORDINATING_ONLY, coordinatingOnlyCount);
         return expectedCounts;
     }

server/src/internalClusterTest/java/org/opensearch/cluster/ClusterInfoServiceIT.java

@@ -195,7 +195,7 @@ public void testClusterInfoServiceCollectsInformation() {
 
         final Map<String, FileCacheStats> nodeFileCacheStats = info.nodeFileCacheStats;
         assertNotNull(nodeFileCacheStats);
-        assertThat("file cache is empty on non search nodes", nodeFileCacheStats.size(), Matchers.equalTo(0));
+        assertThat("file cache is empty on non warm nodes", nodeFileCacheStats.size(), Matchers.equalTo(0));
 
         ClusterService clusterService = internalTestCluster.getInstance(ClusterService.class, internalTestCluster.getClusterManagerName());
         ClusterState state = clusterService.state();
@@ -216,7 +216,7 @@ public void testClusterInfoServiceCollectsInformation() {
 
     public void testClusterInfoServiceCollectsFileCacheInformation() {
         internalCluster().startNodes(1);
-        internalCluster().ensureAtLeastNumSearchAndDataNodes(2);
+        internalCluster().ensureAtLeastNumWarmAndDataNodes(2);
 
         InternalTestCluster internalTestCluster = internalCluster();
         // Get the cluster info service on the cluster-manager node
@@ -229,7 +229,7 @@ public void testClusterInfoServiceCollectsFileCacheInformation() {
         assertNotNull("info should not be null", info);
         final Map<String, FileCacheStats> nodeFileCacheStats = info.nodeFileCacheStats;
         assertNotNull(nodeFileCacheStats);
-        assertThat("file cache is enabled on both search nodes", nodeFileCacheStats.size(), Matchers.equalTo(2));
+        assertThat("file cache is enabled on both warm nodes", nodeFileCacheStats.size(), Matchers.equalTo(2));
 
         for (FileCacheStats fileCacheStats : nodeFileCacheStats.values()) {
             assertThat("file cache is non empty", fileCacheStats.getTotal().getBytes(), greaterThan(0L));

server/src/internalClusterTest/java/org/opensearch/indices/replication/WarmIndexSegmentReplicationIT.java

@@ -84,7 +84,7 @@ public void testWritableWarmFeatureFlagDisabled() {
 
         InternalTestCluster internalTestCluster = internalCluster();
         internalTestCluster.startClusterManagerOnlyNode(clusterSettings);
-        internalTestCluster.startDataAndSearchNodes(1);
+        internalTestCluster.startDataAndWarmNodes(1);
 
         Settings indexSettings = Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
@@ -109,7 +109,7 @@ public void testWritableWarmFeatureFlagDisabled() {
     public void testWritableWarmBasic() throws Exception {
         InternalTestCluster internalTestCluster = internalCluster();
         internalTestCluster.startClusterManagerOnlyNode();
-        internalTestCluster.startDataAndSearchNodes(1);
+        internalTestCluster.startDataAndWarmNodes(1);
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
             .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)

server/src/internalClusterTest/java/org/opensearch/remotestore/WritableWarmIT.java

@@ -758,15 +758,15 @@ public BootstrapCheckResult check(BootstrapContext context) {
     }
 
     /**
-     * Bootstrap check that if a search node contains multiple data paths
+     * Bootstrap check that if a warm node contains multiple data paths
      */
     static class MultipleDataPathCheck implements BootstrapCheck {
 
         @Override
         public BootstrapCheckResult check(BootstrapContext context) {
-            if (NodeRoleSettings.NODE_ROLES_SETTING.get(context.settings()).contains(DiscoveryNodeRole.SEARCH_ROLE)
+            if (NodeRoleSettings.NODE_ROLES_SETTING.get(context.settings()).contains(DiscoveryNodeRole.WARM_ROLE)
                 && Environment.PATH_DATA_SETTING.get(context.settings()).size() > 1) {
-                return BootstrapCheckResult.failure("Multiple data paths are not allowed for search nodes");
+                return BootstrapCheckResult.failure("Multiple data paths are not allowed for warm nodes");
             }
             return BootstrapCheckResult.success();
         }

server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java

@@ -274,7 +274,7 @@ public void onResponse(NodesStatsResponse nodesStatsResponse) {
                 nodeFileCacheStats = Collections.unmodifiableMap(
                     nodesStatsResponse.getNodes()
                         .stream()
-                        .filter(nodeStats -> nodeStats.getNode().isSearchNode())
+                        .filter(nodeStats -> nodeStats.getNode().isWarmNode())
                         .collect(Collectors.toMap(nodeStats -> nodeStats.getNode().getId(), NodeStats::getFileCacheStats))
                 );
             }

server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java

@@ -130,12 +130,12 @@ public static boolean isRemoteClusterClient(final Settings settings) {
         return hasRole(settings, DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE);
     }
 
-    public static boolean isSearchNode(Settings settings) {
-        return hasRole(settings, DiscoveryNodeRole.SEARCH_ROLE);
+    public static boolean isWarmNode(Settings settings) {
+        return hasRole(settings, DiscoveryNodeRole.WARM_ROLE);
     }
 
-    public static boolean isDedicatedSearchNode(Settings settings) {
-        return getRolesFromSettings(settings).stream().allMatch(DiscoveryNodeRole.SEARCH_ROLE::equals);
+    public static boolean isDedicatedWarmNode(Settings settings) {
+        return getRolesFromSettings(settings).stream().allMatch(DiscoveryNodeRole.WARM_ROLE::equals);
     }
 
     private final String nodeName;
@@ -541,12 +541,12 @@ public boolean isRemoteClusterClient() {
     }
 
     /**
-     * Returns whether the node is dedicated to provide search capability.
+     * Returns whether the node is dedicated to hold warm indices.
      *
-     * @return true if the node contains search role, false otherwise
+     * @return true if the node contains warm role, false otherwise
      */
-    public boolean isSearchNode() {
-        return roles.contains(DiscoveryNodeRole.SEARCH_ROLE);
+    public boolean isWarmNode() {
+        return roles.contains(DiscoveryNodeRole.WARM_ROLE);
     }
 
     /**

server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java

@@ -298,13 +298,13 @@ public Setting<Boolean> legacySetting() {
     };
 
     /**
-     * Represents the role for a search node, which is dedicated to provide search capability.
+     * Represents the role for a warm node, which is dedicated to hold warm indices.
      */
-    public static final DiscoveryNodeRole SEARCH_ROLE = new DiscoveryNodeRole("search", "s", true) {
+    public static final DiscoveryNodeRole WARM_ROLE = new DiscoveryNodeRole("warm", "w", true) {
 
         @Override
         public Setting<Boolean> legacySetting() {
-            // search role is added in 2.4 so doesn't need to configure legacy setting
+            // warm role is added in 2.4 so doesn't need to configure legacy setting
             return null;
         }
 
@@ -314,7 +314,7 @@ public Setting<Boolean> legacySetting() {
      * The built-in node roles.
      */
     public static SortedSet<DiscoveryNodeRole> BUILT_IN_ROLES = Collections.unmodifiableSortedSet(
-        new TreeSet<>(Arrays.asList(DATA_ROLE, INGEST_ROLE, CLUSTER_MANAGER_ROLE, REMOTE_CLUSTER_CLIENT_ROLE, SEARCH_ROLE))
+        new TreeSet<>(Arrays.asList(DATA_ROLE, INGEST_ROLE, CLUSTER_MANAGER_ROLE, REMOTE_CLUSTER_CLIENT_ROLE, WARM_ROLE))
     );
 
     /**