Merge pull request #16243 from ywelsch/fix/remove-shardrouting-version

Remove obsolete version in ShardRouting

core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java

@@ -34,6 +34,7 @@
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.index.shard.ShardStateMetaData;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -55,7 +56,7 @@ public class IndicesShardStoresResponse extends ActionResponse implements ToXCon
      */
     public static class StoreStatus implements Streamable, ToXContent, Comparable<StoreStatus> {
         private DiscoveryNode node;
-        private long version;
+        private long legacyVersion;
         private String allocationId;
         private Throwable storeException;
         private AllocationStatus allocationStatus;
@@ -116,9 +117,9 @@ private void writeTo(StreamOutput out) throws IOException {
         private StoreStatus() {
         }
 
-        public StoreStatus(DiscoveryNode node, long version, String allocationId, AllocationStatus allocationStatus, Throwable storeException) {
+        public StoreStatus(DiscoveryNode node, long legacyVersion, String allocationId, AllocationStatus allocationStatus, Throwable storeException) {
             this.node = node;
-            this.version = version;
+            this.legacyVersion = legacyVersion;
             this.allocationId = allocationId;
             this.allocationStatus = allocationStatus;
             this.storeException = storeException;
@@ -132,10 +133,10 @@ public DiscoveryNode getNode() {
         }
 
         /**
-         * Version of the store
+         * Version of the store for pre-3.0 shards that have not yet been active
          */
-        public long getVersion() {
-            return version;
+        public long getLegacyVersion() {
+            return legacyVersion;
         }
 
         /**
@@ -173,7 +174,7 @@ static StoreStatus readStoreStatus(StreamInput in) throws IOException {
         @Override
         public void readFrom(StreamInput in) throws IOException {
             node = DiscoveryNode.readNode(in);
-            version = in.readLong();
+            legacyVersion = in.readLong();
             allocationId = in.readOptionalString();
             allocationStatus = AllocationStatus.readFrom(in);
             if (in.readBoolean()) {
@@ -184,7 +185,7 @@ public void readFrom(StreamInput in) throws IOException {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             node.writeTo(out);
-            out.writeLong(version);
+            out.writeLong(legacyVersion);
             out.writeOptionalString(allocationId);
             allocationStatus.writeTo(out);
             if (storeException != null) {
@@ -198,8 +199,12 @@ public void writeTo(StreamOutput out) throws IOException {
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             node.toXContent(builder, params);
-            builder.field(Fields.VERSION, version);
-            builder.field(Fields.ALLOCATION_ID, allocationId);
+            if (legacyVersion != ShardStateMetaData.NO_VERSION) {
+                builder.field(Fields.LEGACY_VERSION, legacyVersion);
+            }
+            if (allocationId != null) {
+                builder.field(Fields.ALLOCATION_ID, allocationId);
+            }
             builder.field(Fields.ALLOCATED, allocationStatus.value());
             if (storeException != null) {
                 builder.startObject(Fields.STORE_EXCEPTION);
@@ -215,12 +220,23 @@ public int compareTo(StoreStatus other) {
                 return 1;
             } else if (other.storeException != null && storeException == null) {
                 return -1;
-            } else {
-                int compare = Long.compare(other.version, version);
+            }
+            if (allocationId != null && other.allocationId == null) {
+                return -1;
+            } else if (allocationId == null && other.allocationId != null) {
+                return 1;
+            } else if (allocationId == null && other.allocationId == null) {
+                int compare = Long.compare(other.legacyVersion, legacyVersion);
                 if (compare == 0) {
                     return Integer.compare(allocationStatus.id, other.allocationStatus.id);
                 }
                 return compare;
+            } else {
+                int compare = Integer.compare(allocationStatus.id, other.allocationStatus.id);
+                if (compare == 0) {
+                    return allocationId.compareTo(other.allocationId);
+                }
+                return compare;
             }
         }
     }
@@ -390,7 +406,7 @@ static final class Fields {
         static final XContentBuilderString FAILURES = new XContentBuilderString("failures");
         static final XContentBuilderString STORES = new XContentBuilderString("stores");
         // StoreStatus fields
-        static final XContentBuilderString VERSION = new XContentBuilderString("version");
+        static final XContentBuilderString LEGACY_VERSION = new XContentBuilderString("legacy_version");
         static final XContentBuilderString ALLOCATION_ID = new XContentBuilderString("allocation_id");
         static final XContentBuilderString STORE_EXCEPTION = new XContentBuilderString("store_exception");
         static final XContentBuilderString ALLOCATED = new XContentBuilderString("allocation");

core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java

@@ -180,7 +180,7 @@ void finish() {
                     for (NodeGatewayStartedShards response : fetchResponse.responses) {
                         if (shardExistsInNode(response)) {
                             IndicesShardStoresResponse.StoreStatus.AllocationStatus allocationStatus = getAllocationStatus(fetchResponse.shardId.getIndexName(), fetchResponse.shardId.id(), response.getNode());
-                            storeStatuses.add(new IndicesShardStoresResponse.StoreStatus(response.getNode(), response.version(), response.allocationId(), allocationStatus, response.storeException()));
+                            storeStatuses.add(new IndicesShardStoresResponse.StoreStatus(response.getNode(), response.legacyVersion(), response.allocationId(), allocationStatus, response.storeException()));
                         }
                     }
                     CollectionUtil.timSort(storeStatuses);
@@ -213,7 +213,7 @@ private IndicesShardStoresResponse.StoreStatus.AllocationStatus getAllocationSta
              * A shard exists/existed in a node only if shard state file exists in the node
              */
             private boolean shardExistsInNode(final NodeGatewayStartedShards response) {
-                return response.storeException() != null || response.version() != -1 || response.allocationId() != null;
+                return response.storeException() != null || response.legacyVersion() != -1 || response.allocationId() != null;
             }
 
             @Override

core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java

@@ -94,19 +94,6 @@ public Index getIndex() {
         return index;
     }
 
-    /**
-     * creates a new {@link IndexRoutingTable} with all shard versions normalized
-     *
-     * @return new {@link IndexRoutingTable}
-     */
-    public IndexRoutingTable normalizeVersions() {
-        IndexRoutingTable.Builder builder = new Builder(this.index);
-        for (IntObjectCursor<IndexShardRoutingTable> cursor : shards) {
-            builder.addIndexShard(cursor.value.normalizeVersions());
-        }
-        return builder.build();
-    }
-
     public void validate(RoutingTableValidation validation, MetaData metaData) {
         if (!metaData.hasIndex(index.getName())) {
             validation.addIndexFailure(index.getName(), "Exists in routing does not exists in metadata");

core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java

@@ -119,40 +119,6 @@ public class IndexShardRoutingTable implements Iterable<ShardRouting> {
         this.allInitializingShards = Collections.unmodifiableList(allInitializingShards);
     }
 
-    /**
-     * Normalizes all shard routings to the same version.
-     */
-    public IndexShardRoutingTable normalizeVersions() {
-        if (shards.isEmpty()) {
-            return this;
-        }
-        if (shards.size() == 1) {
-            return this;
-        }
-        long highestVersion = shards.get(0).version();
-        boolean requiresNormalization = false;
-        for (int i = 1; i < shards.size(); i++) {
-            if (shards.get(i).version() != highestVersion) {
-                requiresNormalization = true;
-            }
-            if (shards.get(i).version() > highestVersion) {
-                highestVersion = shards.get(i).version();
-            }
-        }
-        if (!requiresNormalization) {
-            return this;
-        }
-        List<ShardRouting> shardRoutings = new ArrayList<>(shards.size());
-        for (int i = 0; i < shards.size(); i++) {
-            if (shards.get(i).version() == highestVersion) {
-                shardRoutings.add(shards.get(i));
-            } else {
-                shardRoutings.add(new ShardRouting(shards.get(i), highestVersion));
-            }
-        }
-        return new IndexShardRoutingTable(shardId, Collections.unmodifiableList(shardRoutings));
-    }
-
     /**
      * Returns the shards id
      *

core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java

@@ -693,9 +693,9 @@ public ShardRouting next() {
             /**
              * Initializes the current unassigned shard and moves it from the unassigned list.
              */
-            public void initialize(String nodeId, long version, long expectedShardSize) {
+            public void initialize(String nodeId, long expectedShardSize) {
                 innerRemove();
-                nodes.initialize(new ShardRouting(current, version), nodeId, expectedShardSize);
+                nodes.initialize(new ShardRouting(current), nodeId, expectedShardSize);
             }
 
             /**
@@ -711,7 +711,7 @@ public void removeAndIgnore() {
 
             /**
              * Unsupported operation, just there for the interface. Use {@link #removeAndIgnore()} or
-             * {@link #initialize(String, long, long)}.
+             * {@link #initialize(String, long)}.
              */
             @Override
             public void remove() {

core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java

@@ -588,7 +588,7 @@ public RoutingTable build() {
             }
             // normalize the versions right before we build it...
             for (ObjectCursor<IndexRoutingTable> indexRoutingTable : indicesRouting.values()) {
-                indicesRouting.put(indexRoutingTable.value.getIndex().getName(), indexRoutingTable.value.normalizeVersions());
+                indicesRouting.put(indexRoutingTable.value.getIndex().getName(), indexRoutingTable.value);
             }
             RoutingTable table = new RoutingTable(version, indicesRouting.build());
             indicesRouting = null;