Merge branch 'opensearch-project:main' into xcontentstatuscode

qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/RefreshVersionInClusterStateIT.java

@@ -18,7 +18,7 @@
 public class RefreshVersionInClusterStateIT extends AbstractRollingTestCase {
 
     /*
-    This test ensures that after the upgrade from ElasticSearch/ OpenSearch all nodes report the version on and after 1.0.0
+     * This test ensures that after the upgrade, all nodes report the current version
      */
     public void testRefresh() throws IOException {
         switch (CLUSTER_TYPE) {

server/build.gradle

@@ -155,22 +155,6 @@ tasks.named("internalClusterTest").configure {
   jvmArgs -= '-XX:TieredStopAtLevel=1'
 }
 
-// Until this project is always being formatted with spotless, we need to
-// guard against `spotless()` not existing.
-try {
-  spotless {
-    java {
-      // Contains large data tables that do not format well.
-      targetExclude 'src/main/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlus.java'
-    }
-  }
-}
-catch (Exception e) {
-  if (e.getMessage().contains("Could not find method spotless") == false) {
-    throw e;
-  }
-}
-
 tasks.named("forbiddenPatterns").configure {
     exclude '**/*.json'
     exclude '**/*.jmx'

server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java

@@ -142,7 +142,7 @@ public class JoinHelper {
         this.nodeHealthService = nodeHealthService;
         this.joinTimeout = JOIN_TIMEOUT_SETTING.get(settings);
         this.nodeCommissioned = nodeCommissioned;
-        this.joinTaskExecutorGenerator = () -> new JoinTaskExecutor(settings, allocationService, logger, rerouteService, transportService) {
+        this.joinTaskExecutorGenerator = () -> new JoinTaskExecutor(settings, allocationService, logger, rerouteService) {
 
             private final long term = currentTermSupplier.getAsLong();
 

server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java

@@ -48,7 +48,6 @@
 import org.opensearch.common.Priority;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.persistent.PersistentTasksCustomMetadata;
-import org.opensearch.transport.TransportService;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -74,7 +73,6 @@ public class JoinTaskExecutor implements ClusterStateTaskExecutor<JoinTaskExecut
 
     private final Logger logger;
     private final RerouteService rerouteService;
-    private final TransportService transportService;
 
     /**
      * Task for the join task executor.
@@ -127,17 +125,10 @@ public boolean isFinishElectionTask() {
         private static final String FINISH_ELECTION_TASK_REASON = "_FINISH_ELECTION_";
     }
 
-    public JoinTaskExecutor(
-        Settings settings,
-        AllocationService allocationService,
-        Logger logger,
-        RerouteService rerouteService,
-        TransportService transportService
-    ) {
+    public JoinTaskExecutor(Settings settings, AllocationService allocationService, Logger logger, RerouteService rerouteService) {
         this.allocationService = allocationService;
         this.logger = logger;
         this.rerouteService = rerouteService;
-        this.transportService = transportService;
     }
 
     @Override
@@ -261,9 +252,7 @@ protected ClusterState.Builder becomeClusterManagerAndTrimConflictingNodes(Clust
         nodesBuilder.clusterManagerNodeId(currentState.nodes().getLocalNodeId());
 
         for (final Task joinTask : joiningNodes) {
-            if (joinTask.isBecomeClusterManagerTask()) {
-                refreshDiscoveryNodeVersionAfterUpgrade(currentNodes, nodesBuilder);
-            } else if (joinTask.isFinishElectionTask()) {
+            if (joinTask.isBecomeClusterManagerTask() || joinTask.isFinishElectionTask()) {
                 // no-op
             } else {
                 final DiscoveryNode joiningNode = joinTask.node();
@@ -300,20 +289,6 @@ protected ClusterState.Builder becomeClusterManagerAndTrimConflictingNodes(Clust
         return ClusterState.builder(allocationService.disassociateDeadNodes(tmpState, false, "removed dead nodes on election"));
     }
 
-    private void refreshDiscoveryNodeVersionAfterUpgrade(DiscoveryNodes currentNodes, DiscoveryNodes.Builder nodesBuilder) {
-        // During the upgrade from Elasticsearch, OpenSearch node send their version as 7.10.2 to Elasticsearch master
-        // in order to successfully join the cluster. But as soon as OpenSearch node becomes the master, cluster state
-        // should show the OpenSearch nodes version as 1.x. As the cluster state was carry forwarded from ES master,
-        // version in DiscoveryNode is stale 7.10.2. As soon as OpenSearch node becomes master, it can refresh the
-        // DiscoveryNodes version and publish the updated state while finishing the election. This helps in atomically
-        // updating the version of those node which have connection with the new master.
-        // Note: This should get deprecated with BWC mode logic
-        if (null == transportService) {
-            // this logic is only applicable when OpenSearch node is cluster-manager and is noop for zen discovery node
-            return;
-        }
-    }
-
     @Override
     public boolean runOnlyOnClusterManager() {
         // we validate that we are allowed to change the cluster state during cluster state processing

server/src/main/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlus.java

@@ -236,10 +236,9 @@ private static class HyperLogLog extends AbstractHyperLogLog implements Releasab
         // array for holding the runlens.
         private ByteArray runLens;
 
-
         HyperLogLog(BigArrays bigArrays, long initialBucketCount, int precision) {
             super(precision);
-            this.runLens =  bigArrays.newByteArray(initialBucketCount << precision);
+            this.runLens = bigArrays.newByteArray(initialBucketCount << precision);
             this.bigArrays = bigArrays;
             this.iterator = new HyperLogLogIterator(this, precision, m);
         }

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

@@ -41,7 +41,6 @@
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
-import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Strings;
 import org.opensearch.common.component.AbstractLifecycleComponent;
@@ -72,7 +71,6 @@
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -793,18 +791,6 @@ public Transport.Connection getConnection(DiscoveryNode node) {
         }
     }
 
-    public Map<String, Version> getChannelVersion(DiscoveryNodes nodes) {
-        Map<String, Version> nodeChannelVersions = new HashMap<>(nodes.getSize());
-        for (DiscoveryNode node : nodes) {
-            try {
-                nodeChannelVersions.putIfAbsent(node.getId(), connectionManager.getConnection(node).getVersion());
-            } catch (Exception e) {
-                // ignore in case node is not connected
-            }
-        }
-        return nodeChannelVersions;
-    }
-
     public final <T extends TransportResponse> void sendChildRequest(
         final DiscoveryNode node,
         final String action,

server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java

@@ -175,7 +175,7 @@ public void testUpdatesNodeWithNewRoles() throws Exception {
         when(allocationService.adaptAutoExpandReplicas(any())).then(invocationOnMock -> invocationOnMock.getArguments()[0]);
         final RerouteService rerouteService = (reason, priority, listener) -> listener.onResponse(null);
 
-        final JoinTaskExecutor joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, rerouteService, null);
+        final JoinTaskExecutor joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, rerouteService);
 
         final DiscoveryNode clusterManagerNode = new DiscoveryNode(UUIDs.base64UUID(), buildNewFakeTransportAddress(), Version.CURRENT);
 
@@ -270,7 +270,7 @@ public void testJoinFailedForDecommissionedNode() throws Exception {
         when(allocationService.adaptAutoExpandReplicas(any())).then(invocationOnMock -> invocationOnMock.getArguments()[0]);
         final RerouteService rerouteService = (reason, priority, listener) -> listener.onResponse(null);
 
-        final JoinTaskExecutor joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, rerouteService, null);
+        final JoinTaskExecutor joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, rerouteService);
 
         final DiscoveryNode clusterManagerNode = new DiscoveryNode(UUIDs.base64UUID(), buildNewFakeTransportAddress(), Version.CURRENT);
 

server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java

@@ -357,7 +357,7 @@ public IndexMetadata upgradeIndexMetadata(IndexMetadata indexMetadata, Version m
         );
 
         nodeRemovalExecutor = new NodeRemovalClusterStateTaskExecutor(allocationService, logger);
-        joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, (s, p, r) -> {}, transportService);
+        joinTaskExecutor = new JoinTaskExecutor(Settings.EMPTY, allocationService, logger, (s, p, r) -> {});
     }
 
     public ClusterState createIndex(ClusterState state, CreateIndexRequest request) {