Move data tier roles to server (#71084)

This commit moves the data tier roles to server. It is no longer
necessary to separate these roles from server as we no longer build
distributions that would not contain these roles. Moving these roles
will simplify many things. This is deliberately the smallest possible
commit that moves these roles. Other aspects related to the data tiers
can move in separate, also small, commits.

Author: jasontedor

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml

@@ -26,7 +26,11 @@ setup:
   - is_true: nodes.$node_id.roles
   # the roles output is sorted
   - match: { nodes.$node_id.roles.0: "data" }
-  - match: { nodes.$node_id.roles.1: "ingest" }
-  - match: { nodes.$node_id.roles.2: "master" }
-  - match: { nodes.$node_id.roles.3: "remote_cluster_client" }
-
+  - match: { nodes.$node_id.roles.1: "data_cold" }
+  - match: { nodes.$node_id.roles.2: "data_content" }
+  - match: { nodes.$node_id.roles.3: "data_frozen" }
+  - match: { nodes.$node_id.roles.4: "data_hot" }
+  - match: { nodes.$node_id.roles.5: "data_warm" }
+  - match: { nodes.$node_id.roles.6: "ingest" }
+  - match: { nodes.$node_id.roles.7: "master" }
+  - match: { nodes.$node_id.roles.8: "remote_cluster_client" }

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

@@ -58,6 +58,11 @@ public void testNodeCounts() {
         internalCluster().startNode();
         Map<String, Integer> expectedCounts = new HashMap<>();
         expectedCounts.put(DiscoveryNodeRole.DATA_ROLE.roleName(), 1);
+        expectedCounts.put(DiscoveryNodeRole.DATA_CONTENT_NODE_ROLE.roleName(), 1);
+        expectedCounts.put(DiscoveryNodeRole.DATA_COLD_NODE_ROLE.roleName(), 1);
+        expectedCounts.put(DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName(), 1);
+        expectedCounts.put(DiscoveryNodeRole.DATA_HOT_NODE_ROLE.roleName(), 1);
+        expectedCounts.put(DiscoveryNodeRole.DATA_WARM_NODE_ROLE.roleName(), 1);
         expectedCounts.put(DiscoveryNodeRole.MASTER_ROLE.roleName(), 1);
         expectedCounts.put(DiscoveryNodeRole.INGEST_ROLE.roleName(), 1);
         expectedCounts.put(DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE.roleName(), 1);

server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java

@@ -68,7 +68,7 @@ public void testStartFailureOnDataForNonDataNode() throws Exception {
                 internalCluster().restartRandomDataNode(new InternalTestCluster.RestartCallback() {
                     @Override
                     public Settings onNodeStopped(String nodeName) {
-                        return NodeRoles.removeRoles(Set.of(DiscoveryNodeRole.DATA_ROLE, DiscoveryNodeRole.MASTER_ROLE));
+                        return NodeRoles.removeRoles(nonDataNode(), Set.of(DiscoveryNodeRole.MASTER_ROLE));
                     }
                 }));
         if (writeDanglingIndices) {

server/src/internalClusterTest/java/org/elasticsearch/env/NodeRepurposeCommandIT.java

@@ -14,6 +14,8 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.hamcrest.Matcher;
 
+import static org.elasticsearch.test.NodeRoles.nonDataNode;
+import static org.elasticsearch.test.NodeRoles.nonMasterNode;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 
@@ -45,7 +47,7 @@ public void testRepurpose() throws Exception {
         final Settings dataNodeDataPathSettings = internalCluster().dataPathSettings(dataNode);
 
         // put some unknown role here to make sure the tool does not bark when encountering an unknown role
-        final Settings noMasterNoDataSettings = Settings.builder().putList("node.roles", "unknown_role").build();
+        final Settings noMasterNoDataSettings = nonMasterNode(nonDataNode());
 
         final Settings noMasterNoDataSettingsForMasterNode = Settings.builder()
             .put(noMasterNoDataSettings)

server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java

@@ -323,7 +323,7 @@ public void testCorruptionOnNetworkLayerFinalizingRecovery() throws ExecutionExc
         NodesStatsResponse nodeStats = client().admin().cluster().prepareNodesStats().get();
         List<NodeStats> dataNodeStats = new ArrayList<>();
         for (NodeStats stat : nodeStats.getNodes()) {
-            if (stat.getNode().isDataNode()) {
+            if (stat.getNode().canContainData()) {
                 dataNodeStats.add(stat);
             }
         }
@@ -383,7 +383,7 @@ public void testCorruptionOnNetworkLayer() throws ExecutionException, Interrupte
         NodesStatsResponse nodeStats = client().admin().cluster().prepareNodesStats().get();
         List<NodeStats> dataNodeStats = new ArrayList<>();
         for (NodeStats stat : nodeStats.getNodes()) {
-            if (stat.getNode().isDataNode()) {
+            if (stat.getNode().canContainData()) {
                 dataNodeStats.add(stat);
             }
         }

server/src/internalClusterTest/java/org/elasticsearch/index/store/ExceptionRetryIT.java

@@ -71,7 +71,7 @@ public void testRetryDueToExceptionOnNetworkLayer() throws ExecutionException, I
         int numDocs = scaledRandomIntBetween(100, 1000);
         Client client = internalCluster().coordOnlyNodeClient();
         NodesStatsResponse nodeStats = client().admin().cluster().prepareNodesStats().get();
-        NodeStats unluckyNode = randomFrom(nodeStats.getNodes().stream().filter((s) -> s.getNode().isDataNode())
+        NodeStats unluckyNode = randomFrom(nodeStats.getNodes().stream().filter((s) -> s.getNode().canContainData())
             .collect(Collectors.toList()));
         assertAcked(client().admin().indices().prepareCreate("index").setSettings(Settings.builder()
             .put("index.number_of_replicas", 1)

server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java

@@ -325,7 +325,7 @@ public void testLimitsRequestSize() {
         NodesStatsResponse nodeStats = client().admin().cluster().prepareNodesStats().get();
         List<NodeStats> dataNodeStats = new ArrayList<>();
         for (NodeStats stat : nodeStats.getNodes()) {
-            if (stat.getNode().isDataNode()) {
+            if (stat.getNode().canContainData()) {
                 dataNodeStats.add(stat);
             }
         }

server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java

@@ -179,7 +179,7 @@ public void testCloseWhileRelocatingShards() throws Exception {
                 (MockTransportService) internalCluster().getInstance(TransportService.class, targetNode);
 
             for (DiscoveryNode node : state.getNodes()) {
-                if (node.isDataNode() && node.getName().equals(targetNode) == false) {
+                if (node.canContainData() && node.getName().equals(targetNode) == false) {
                     final TransportService sourceTransportService = internalCluster().getInstance(TransportService.class, node.getName());
                     targetTransportService.addSendBehavior(sourceTransportService, sendBehavior);
                 }

server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java

@@ -62,7 +62,7 @@ public void testCancelRecoveryAndResume() throws Exception {
         NodesStatsResponse nodeStats = client().admin().cluster().prepareNodesStats().get();
         List<NodeStats> dataNodeStats = new ArrayList<>();
         for (NodeStats stat : nodeStats.getNodes()) {
-            if (stat.getNode().isDataNode()) {
+            if (stat.getNode().canContainData()) {
                 dataNodeStats.add(stat);
             }
         }

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchIT.java

@@ -151,7 +151,7 @@ public void testCancel() throws Exception {
         if (randomBoolean()) {
             remoteCluster.ensureAtLeastNumDataNodes(3);
             List<String> remoteDataNodes = StreamSupport.stream(remoteCluster.clusterService().state().nodes().spliterator(), false)
-                .filter(DiscoveryNode::isDataNode)
+                .filter(DiscoveryNode::canContainData)
                 .map(DiscoveryNode::getName)
                 .collect(Collectors.toList());
             assertThat(remoteDataNodes.size(), Matchers.greaterThanOrEqualTo(3));