Make node client type setting a noop (elastic#101214)

The node client type is a remnant of the transport client. This commit cleans up some test reads and an unnecessary override of the setting. It was already not read anywhere in production. Now it is only registered in order to provide validation. In the future it should be deprecated and removed.
iverase · Oct 24, 2023 · b0fb121 · b0fb121
1 parent 6e6e85d
commit b0fb121
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 43 deletions.
diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
@@ -218,6 +218,12 @@ tasks.named("yamlRestTestV7CompatTransform").configure { task ->
 
   // we can now search using doc values only
   task.replaceValueInMatch("fields.object\\.nested1.long.searchable", true)
+
+  //client.type no longer exists #101214
+  task.replaceKeyInMatch("nodes.\$node_id.settings.client.type", "nodes.\$node_id.settings.node.attr.testattr")
+  task.replaceValueInMatch("nodes.\$node_id.settings.node.attr.testattr", "test")
+  task.replaceKeyInMatch("nodes.\$node_id.settings.client\\.type", "nodes.\$node_id.settings.node\\.attr\\.testattr")
+  task.replaceValueInMatch("nodes.\$node_id.settings.node\\.attr\\.testattr", "test")
 }
 
 tasks.register('enforceYamlTestConvention').configure {

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/30_settings.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/30_settings.yml
@@ -12,11 +12,11 @@
       nodes.info:
         metric: [ settings ]
 
-  - match : { nodes.$node_id.settings.client.type: node }
+  - match : { nodes.$node_id.settings.node.attr.testattr: test }
 
   - do:
       nodes.info:
         metric: [ settings ]
         flat_settings: true
 
-  - match : { nodes.$node_id.settings.client\.type: node }
+  - match : { nodes.$node_id.settings.node\.attr\.testattr: test }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/client/internal/node/NodeClientIT.java b/server/src/internalClusterTest/java/org/elasticsearch/client/internal/node/NodeClientIT.java
diff --git a/server/src/main/java/org/elasticsearch/client/internal/Client.java b/server/src/main/java/org/elasticsearch/client/internal/Client.java
@@ -73,6 +73,7 @@
  */
 public interface Client extends ElasticsearchClient, Releasable {
 
+    // Note: This setting is registered only for bwc. The value is never read.
     Setting<String> CLIENT_TYPE_SETTING_S = new Setting<>("client.type", "node", (s) -> {
         return switch (s) {
             case "node", "transport" -> s;

diff --git a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
@@ -345,10 +345,7 @@ private void construct(Environment initialEnvironment, NodeServiceProvider servi
         throws IOException {
         // Pass the node settings to the DeprecationLogger class so that it can have the deprecation.skip_deprecated_settings setting:
         DeprecationLogger.initialize(initialEnvironment.settings());
-        Settings environmentSettings = Settings.builder()
-            .put(initialEnvironment.settings())
-            .put(Client.CLIENT_TYPE_SETTING_S.getKey(), "node")
-            .build();
+        Settings environmentSettings = initialEnvironment.settings();
 
         final JvmInfo jvmInfo = JvmInfo.jvmInfo();
         logger.info(

diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/XPackPluginTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/XPackPluginTests.java
@@ -8,7 +8,6 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
@@ -74,9 +73,6 @@ public void setup() {
     public void testXPackInstalledAttrClash() throws Exception {
         Settings.Builder builder = Settings.builder();
         builder.put("node.attr." + XPackPlugin.XPACK_INSTALLED_NODE_ATTR, randomBoolean());
-        if (randomBoolean()) {
-            builder.put(Client.CLIENT_TYPE_SETTING_S.getKey(), "transport");
-        }
         XPackPlugin xpackPlugin = createXPackPlugin(builder.put("path.home", createTempDir()).build());
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, xpackPlugin::additionalSettings);
         assertThat(