Remove deprecated search.remote settings

qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartIT.java

@@ -39,7 +39,6 @@
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
 import org.opensearch.client.RestClient;
-import org.opensearch.client.WarningFailureException;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MetadataIndexStateService;
 import org.opensearch.common.Booleans;
@@ -1110,13 +1109,9 @@ private void checkSnapshot(final String snapshotName, final int count, final Ver
         assertEquals(singletonList(tookOnVersion.toString()), XContentMapValues.extractValue("snapshots.version", listSnapshotResponse));
 
         // Remove the routing setting and template so we can test restoring them.
-        try {
-            Request clearRoutingFromSettings = new Request("PUT", "/_cluster/settings");
-            clearRoutingFromSettings.setJsonEntity("{\"persistent\":{\"cluster.routing.allocation.exclude.test_attr\": null}}");
-            client().performRequest(clearRoutingFromSettings);
-        } catch (WarningFailureException e) {
-            throw e;
-        }
+        Request clearRoutingFromSettings = new Request("PUT", "/_cluster/settings");
+        clearRoutingFromSettings.setJsonEntity("{\"persistent\":{\"cluster.routing.allocation.exclude.test_attr\": null}}");
+        client().performRequest(clearRoutingFromSettings);
         client().performRequest(new Request("DELETE", "/_template/test_template"));
 
         // Restore

server/src/internalClusterTest/java/org/opensearch/common/settings/UpgradeSettingsIT.java

@@ -37,8 +37,6 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
-import org.opensearch.transport.RemoteClusterService;
-import org.opensearch.transport.SniffConnectionStrategy;
 
 import org.junit.After;
 
@@ -127,42 +125,4 @@ private void runUpgradeSettingsOnUpdateTest(
         assertTrue(UpgradeSettingsPlugin.newSetting.exists(settingsFunction.apply(response.getState().metadata())));
         assertThat(UpgradeSettingsPlugin.newSetting.get(settingsFunction.apply(response.getState().metadata())), equalTo("new." + value));
     }
-
-    public void testUpgradeRemoteClusterSettings() {
-        final boolean skipUnavailable = randomBoolean();
-        client().admin()
-            .cluster()
-            .prepareUpdateSettings()
-            .setPersistentSettings(
-                Settings.builder()
-                    .put("search.remote.foo.skip_unavailable", skipUnavailable)
-                    .putList("search.remote.foo.seeds", Collections.singletonList("localhost:9200"))
-                    .put("search.remote.foo.proxy", "localhost:9200")
-                    .build()
-            )
-            .get();
-
-        final ClusterStateResponse response = client().admin().cluster().prepareState().clear().setMetadata(true).get();
-
-        final Settings settings = response.getState().metadata().persistentSettings();
-        assertFalse(RemoteClusterService.SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSettingForNamespace("foo").exists(settings));
-        assertTrue(RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSettingForNamespace("foo").exists(settings));
-        assertThat(
-            RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSettingForNamespace("foo").get(settings),
-            equalTo(skipUnavailable)
-        );
-        assertFalse(SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_SEEDS.getConcreteSettingForNamespace("foo").exists(settings));
-        assertTrue(SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace("foo").exists(settings));
-        assertThat(
-            SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace("foo").get(settings),
-            equalTo(Collections.singletonList("localhost:9200"))
-        );
-        assertFalse(SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_PROXY.getConcreteSettingForNamespace("foo").exists(settings));
-        assertTrue(SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY.getConcreteSettingForNamespace("foo").exists(settings));
-        assertThat(
-            SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY.getConcreteSettingForNamespace("foo").get(settings),
-            equalTo("localhost:9200")
-        );
-    }
-
 }

server/src/main/java/org/opensearch/common/settings/ClusterSettings.java

@@ -339,23 +339,16 @@ public void apply(Settings value, Settings current, Settings previous) {
                 TransportSearchAction.SHARD_COUNT_LIMIT_SETTING,
                 TransportSearchAction.SEARCH_CANCEL_AFTER_TIME_INTERVAL_SETTING,
                 RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE,
-                RemoteClusterService.SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE,
                 SniffConnectionStrategy.REMOTE_CONNECTIONS_PER_CLUSTER,
                 RemoteClusterService.REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING,
-                RemoteClusterService.SEARCH_REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING,
                 RemoteClusterService.REMOTE_NODE_ATTRIBUTE,
-                RemoteClusterService.SEARCH_REMOTE_NODE_ATTRIBUTE,
                 RemoteClusterService.ENABLE_REMOTE_CLUSTERS,
-                RemoteClusterService.SEARCH_ENABLE_REMOTE_CLUSTERS,
                 RemoteClusterService.REMOTE_CLUSTER_PING_SCHEDULE,
                 RemoteClusterService.REMOTE_CLUSTER_COMPRESS,
                 RemoteConnectionStrategy.REMOTE_CONNECTION_MODE,
                 ProxyConnectionStrategy.PROXY_ADDRESS,
                 ProxyConnectionStrategy.REMOTE_SOCKET_CONNECTIONS,
                 ProxyConnectionStrategy.SERVER_NAME,
-                SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_SEEDS,
-                SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_PROXY,
-                SniffConnectionStrategy.SEARCH_REMOTE_CONNECTIONS_PER_CLUSTER,
                 ProxyConnectionStrategy.SERVER_NAME,
                 SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY,
                 SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS,
@@ -577,12 +570,6 @@ public void apply(Settings value, Settings current, Settings previous) {
         )
     );
 
-    public static List<SettingUpgrader<?>> BUILT_IN_SETTING_UPGRADERS = Collections.unmodifiableList(
-        Arrays.asList(
-            SniffConnectionStrategy.SEARCH_REMOTE_CLUSTER_SEEDS_UPGRADER,
-            SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_PROXY_UPGRADER,
-            RemoteClusterService.SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE_UPGRADER
-        )
-    );
+    public static List<SettingUpgrader<?>> BUILT_IN_SETTING_UPGRADERS = Collections.emptyList();
 
 }

server/src/main/java/org/opensearch/transport/RemoteClusterAware.java

@@ -144,8 +144,6 @@ public void listenForUpdates(ClusterSettings clusterSettings) {
             RemoteClusterService.REMOTE_CLUSTER_COMPRESS,
             RemoteClusterService.REMOTE_CLUSTER_PING_SCHEDULE,
             RemoteConnectionStrategy.REMOTE_CONNECTION_MODE,
-            SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_SEEDS,
-            SniffConnectionStrategy.SEARCH_REMOTE_CLUSTERS_PROXY,
             SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY,
             SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS,
             SniffConnectionStrategy.REMOTE_NODE_CONNECTIONS,

server/src/main/java/org/opensearch/transport/RemoteClusterService.java

@@ -34,7 +34,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.action.support.GroupedActionListener;
@@ -46,7 +45,6 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
-import org.opensearch.common.settings.SettingUpgrader;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
@@ -81,97 +79,42 @@ public final class RemoteClusterService extends RemoteClusterAware implements Cl
 
     private final Logger logger = LogManager.getLogger(RemoteClusterService.class);
 
-    static {
-        // remove search.remote.* settings in 8.0.0
-        assert Version.CURRENT.major < 8;
-    }
-
-    public static final Setting<TimeValue> SEARCH_REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING = Setting.positiveTimeSetting(
-        "search.remote.initial_connect_timeout",
-        TimeValue.timeValueSeconds(30),
-        Setting.Property.NodeScope,
-        Setting.Property.Deprecated
-    );
-
     /**
      * The initial connect timeout for remote cluster connections
      */
     public static final Setting<TimeValue> REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING = Setting.positiveTimeSetting(
         "cluster.remote.initial_connect_timeout",
-        SEARCH_REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING, // the default needs to be thirty seconds when fallback is removed
+        TimeValue.timeValueSeconds(30),
         Setting.Property.NodeScope
     );
 
-    public static final Setting<String> SEARCH_REMOTE_NODE_ATTRIBUTE = Setting.simpleString(
-        "search.remote.node.attr",
-        Setting.Property.NodeScope,
-        Setting.Property.Deprecated
-    );
-
     /**
      * The name of a node attribute to select nodes that should be connected to in the remote cluster.
      * For instance a node can be configured with {@code node.attr.gateway: true} in order to be eligible as a gateway node between
-     * clusters. In that case {@code search.remote.node.attr: gateway} can be used to filter out other nodes in the remote cluster.
+     * clusters. In that case {@code cluster.remote.node.attr: gateway} can be used to filter out other nodes in the remote cluster.
      * The value of the setting is expected to be a boolean, {@code true} for nodes that can become gateways, {@code false} otherwise.
      */
     public static final Setting<String> REMOTE_NODE_ATTRIBUTE = Setting.simpleString(
         "cluster.remote.node.attr",
-        SEARCH_REMOTE_NODE_ATTRIBUTE, // no default is needed when fallback is removed, use simple string which gives empty
         Setting.Property.NodeScope
     );
 
-    public static final Setting<Boolean> SEARCH_ENABLE_REMOTE_CLUSTERS = Setting.boolSetting(
-        "search.remote.connect",
-        true,
-        Setting.Property.NodeScope,
-        Setting.Property.Deprecated
-    );
-
     /**
      * If <code>true</code> connecting to remote clusters is supported on this node. If <code>false</code> this node will not establish
      * connections to any remote clusters configured. Search requests executed against this node (where this node is the coordinating node)
      * will fail if remote cluster syntax is used as an index pattern. The default is <code>true</code>
      */
     public static final Setting<Boolean> ENABLE_REMOTE_CLUSTERS = Setting.boolSetting(
         "cluster.remote.connect",
-        SEARCH_ENABLE_REMOTE_CLUSTERS, // the default needs to be true when fallback is removed
+        true,
         Setting.Property.Deprecated,
         Setting.Property.NodeScope
     );
 
-    public static final Setting.AffixSetting<Boolean> SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE = Setting.affixKeySetting(
-        "search.remote.",
-        "skip_unavailable",
-        key -> boolSetting(key, false, Setting.Property.Deprecated, Setting.Property.Dynamic, Setting.Property.NodeScope)
-    );
-
-    public static final SettingUpgrader<Boolean> SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE_UPGRADER = new SettingUpgrader<Boolean>() {
-
-        @Override
-        public Setting<Boolean> getSetting() {
-            return SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE;
-        }
-
-        @Override
-        public String getKey(final String key) {
-            return key.replaceFirst("^search", "cluster");
-        }
-
-    };
-
     public static final Setting.AffixSetting<Boolean> REMOTE_CLUSTER_SKIP_UNAVAILABLE = Setting.affixKeySetting(
         "cluster.remote.",
         "skip_unavailable",
-        (ns, key) -> boolSetting(
-            key,
-            // the default needs to be false when fallback is removed
-            "_na_".equals(key)
-                ? SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSettingForNamespace(key)
-                : SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSetting(key.replaceAll("^cluster", "search")),
-            new RemoteConnectionEnabled<>(ns, key),
-            Setting.Property.Dynamic,
-            Setting.Property.NodeScope
-        )
+        (ns, key) -> boolSetting(key, false, new RemoteConnectionEnabled<>(ns, key), Setting.Property.Dynamic, Setting.Property.NodeScope)
     );
 
     public static final Setting.AffixSetting<TimeValue> REMOTE_CLUSTER_PING_SCHEDULE = Setting.affixKeySetting(
@@ -308,7 +251,6 @@ Set<String> getRemoteClusterNames() {
     public void listenForUpdates(ClusterSettings clusterSettings) {
         super.listenForUpdates(clusterSettings);
         clusterSettings.addAffixUpdateConsumer(REMOTE_CLUSTER_SKIP_UNAVAILABLE, this::updateSkipUnavailable, (alias, value) -> {});
-        clusterSettings.addAffixUpdateConsumer(SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE, this::updateSkipUnavailable, (alias, value) -> {});
     }
 
     private synchronized void updateSkipUnavailable(String clusterAlias, Boolean skipUnavailable) {