Add BuildVersion to DiscoveryNode VersionInformation (#115434)

thecoop · web-flow · commit bc270bd39cab · 2024-11-08T15:04:20.000Z
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
@@ -147,7 +147,7 @@ public void testClusterStateDiffSerialization() throws Exception {
                 for (Map.Entry<String, DiscoveryNode> node : clusterStateFromDiffs.nodes().getNodes().entrySet()) {
                     DiscoveryNode node1 = clusterState.nodes().get(node.getKey());
                     DiscoveryNode node2 = clusterStateFromDiffs.nodes().get(node.getKey());
-                    assertThat(node1.getVersion(), equalTo(node2.getVersion()));
+                    assertThat(node1.getBuildVersion(), equalTo(node2.getBuildVersion()));
                     assertThat(node1.getAddress(), equalTo(node2.getAddress()));
                     assertThat(node1.getAttributes(), equalTo(node2.getAttributes()));
                 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
@@ -21,8 +21,8 @@
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.util.StringLiteralDeduplicator;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.env.BuildVersion;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -33,7 +33,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.OptionalInt;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -290,18 +289,6 @@ public static Set<DiscoveryNodeRole> getRolesFromSettings(final Settings setting
         return Set.copyOf(NODE_ROLES_SETTING.get(settings));
     }
 
-    private static VersionInformation inferVersionInformation(Version version) {
-        if (version.before(Version.V_8_10_0)) {
-            return new VersionInformation(
-                version,
-                IndexVersion.getMinimumCompatibleIndexVersion(version.id),
-                IndexVersion.fromId(version.id)
-            );
-        } else {
-            return new VersionInformation(version, IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current());
-        }
-    }
-
     private static final Writeable.Reader<String> readStringLiteral = s -> nodeStringDeduplicator.deduplicate(s.readString());
 
     /**
@@ -338,11 +325,7 @@ public DiscoveryNode(StreamInput in) throws IOException {
             }
         }
         this.roles = Collections.unmodifiableSortedSet(roles);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
-            versionInfo = new VersionInformation(Version.readVersion(in), IndexVersion.readVersion(in), IndexVersion.readVersion(in));
-        } else {
-            versionInfo = inferVersionInformation(Version.readVersion(in));
-        }
+        versionInfo = new VersionInformation(Version.readVersion(in), IndexVersion.readVersion(in), IndexVersion.readVersion(in));
         if (in.getTransportVersion().onOrAfter(EXTERNAL_ID_VERSION)) {
             this.externalId = readStringLiteral.read(in);
         } else {
@@ -375,13 +358,9 @@ public void writeTo(StreamOutput out) throws IOException {
             o.writeString(role.roleNameAbbreviation());
             o.writeBoolean(role.canContainData());
         });
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
-            Version.writeVersion(versionInfo.nodeVersion(), out);
-            IndexVersion.writeVersion(versionInfo.minIndexVersion(), out);
-            IndexVersion.writeVersion(versionInfo.maxIndexVersion(), out);
-        } else {
-            Version.writeVersion(versionInfo.nodeVersion(), out);
-        }
+        Version.writeVersion(versionInfo.nodeVersion(), out);
+        IndexVersion.writeVersion(versionInfo.minIndexVersion(), out);
+        IndexVersion.writeVersion(versionInfo.maxIndexVersion(), out);
         if (out.getTransportVersion().onOrAfter(EXTERNAL_ID_VERSION)) {
             out.writeString(externalId);
         }
@@ -486,18 +465,13 @@ public VersionInformation getVersionInformation() {
         return this.versionInfo;
     }
 
-    public Version getVersion() {
-        return this.versionInfo.nodeVersion();
+    public BuildVersion getBuildVersion() {
+        return versionInfo.buildVersion();
     }
 
-    public OptionalInt getPre811VersionId() {
-        // Even if Version is removed from this class completely it will need to read the version ID
-        // off the wire for old node versions, so the value of this variable can be obtained from that
-        int versionId = versionInfo.nodeVersion().id;
-        if (versionId >= Version.V_8_11_0.id) {
-            return OptionalInt.empty();
-        }
-        return OptionalInt.of(versionId);
+    @Deprecated
+    public Version getVersion() {
+        return this.versionInfo.nodeVersion();
     }
 
     public IndexVersion getMinIndexVersion() {
@@ -564,7 +538,7 @@ public void appendDescriptionWithoutAttributes(StringBuilder stringBuilder) {
             appendRoleAbbreviations(stringBuilder, "");
             stringBuilder.append('}');
         }
-        stringBuilder.append('{').append(versionInfo.nodeVersion()).append('}');
+        stringBuilder.append('{').append(versionInfo.buildVersion()).append('}');
         stringBuilder.append('{').append(versionInfo.minIndexVersion()).append('-').append(versionInfo.maxIndexVersion()).append('}');
     }
 
@@ -601,7 +575,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.value(role.roleName());
         }
         builder.endArray();
-        builder.field("version", versionInfo.nodeVersion());
+        builder.field("version", versionInfo.buildVersion().toString());
         builder.field("min_index_version", versionInfo.minIndexVersion());
         builder.field("max_index_version", versionInfo.maxIndexVersion());
         builder.endObject();
diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
@@ -339,6 +339,13 @@ public boolean hasByName(String name) {
         return false;
     }
 
+    /**
+     * {@code true} if this cluster consists of nodes with several release versions
+     */
+    public boolean isMixedVersionCluster() {
+        return minNodeVersion.equals(maxNodeVersion) == false;
+    }
+
     /**
      * Returns the version of the node with the oldest version in the cluster that is not a client node
      *
diff --git a/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java b/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java
@@ -10,25 +10,57 @@
 package org.elasticsearch.cluster.node;
 
 import org.elasticsearch.Version;
+import org.elasticsearch.env.BuildVersion;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 
 import java.util.Objects;
 
 /**
  * Represents the versions of various aspects of an Elasticsearch node.
- * @param nodeVersion       The node {@link Version}
+ * @param buildVersion      The node {@link BuildVersion}
  * @param minIndexVersion   The minimum {@link IndexVersion} supported by this node
  * @param maxIndexVersion   The maximum {@link IndexVersion} supported by this node
  */
-public record VersionInformation(Version nodeVersion, IndexVersion minIndexVersion, IndexVersion maxIndexVersion) {
+public record VersionInformation(
+    BuildVersion buildVersion,
+    Version nodeVersion,
+    IndexVersion minIndexVersion,
+    IndexVersion maxIndexVersion
+) {
 
     public static final VersionInformation CURRENT = new VersionInformation(
-        Version.CURRENT,
+        BuildVersion.current(),
         IndexVersions.MINIMUM_COMPATIBLE,
         IndexVersion.current()
     );
 
+    public VersionInformation {
+        Objects.requireNonNull(buildVersion);
+        Objects.requireNonNull(nodeVersion);
+        Objects.requireNonNull(minIndexVersion);
+        Objects.requireNonNull(maxIndexVersion);
+    }
+
+    public VersionInformation(BuildVersion version, IndexVersion minIndexVersion, IndexVersion maxIndexVersion) {
+        this(version, Version.CURRENT, minIndexVersion, maxIndexVersion);
+        /*
+         * Whilst DiscoveryNode.getVersion exists, we need to be able to get a Version from VersionInfo
+         * This needs to be consistent - on serverless, BuildVersion has an id of -1, which translates
+         * to a nonsensical Version. So all consumers of Version need to be moved to BuildVersion
+         * before we can remove Version from here.
+         */
+        // for the moment, check this is only called with current() so the implied Version is correct
+        // TODO: work out what needs to happen for other versions. Maybe we can only remove this once the nodeVersion field is gone
+        assert version.equals(BuildVersion.current()) : version + " is not " + BuildVersion.current();
+    }
+
+    @Deprecated
+    public VersionInformation(Version version, IndexVersion minIndexVersion, IndexVersion maxIndexVersion) {
+        this(BuildVersion.fromVersionId(version.id()), version, minIndexVersion, maxIndexVersion);
+    }
+
+    @Deprecated
     public static VersionInformation inferVersions(Version nodeVersion) {
         if (nodeVersion == null) {
             return null;
@@ -44,10 +76,4 @@ public static VersionInformation inferVersions(Version nodeVersion) {
             throw new IllegalArgumentException("Node versions can only be inferred before release version 8.10.0");
         }
     }
-
-    public VersionInformation {
-        Objects.requireNonNull(nodeVersion);
-        Objects.requireNonNull(minIndexVersion);
-        Objects.requireNonNull(maxIndexVersion);
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
@@ -367,7 +367,7 @@ Table buildTable(
                 table.addCell("-");
             }
 
-            table.addCell(node.getVersion().toString());
+            table.addCell(node.getBuildVersion().toString());
             table.addCell(info == null ? null : info.getBuild().type().displayName());
             table.addCell(info == null ? null : info.getBuild().hash());
             table.addCell(jvmInfo == null ? null : jvmInfo.version());
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java
@@ -140,7 +140,7 @@ private static void buildRow(Table table, boolean fullId, boolean detailed, Disc
         table.addCell(node == null ? "-" : node.getHostAddress());
         table.addCell(node.getAddress().address().getPort());
         table.addCell(node == null ? "-" : node.getName());
-        table.addCell(node == null ? "-" : node.getVersion().toString());
+        table.addCell(node == null ? "-" : node.getBuildVersion().toString());
         table.addCell(taskInfo.headers().getOrDefault(Task.X_OPAQUE_ID_HTTP_HEADER, "-"));
 
         if (detailed) {
diff --git a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
@@ -576,7 +576,7 @@ public void testDelegateToFailingMaster() throws ExecutionException, Interrupted
                 // simulate master restart followed by a state recovery - this will reset the cluster state version
                 final DiscoveryNodes.Builder nodesBuilder = DiscoveryNodes.builder(clusterService.state().nodes());
                 nodesBuilder.remove(masterNode);
-                masterNode = DiscoveryNodeUtils.create(masterNode.getId(), masterNode.getAddress(), masterNode.getVersion());
+                masterNode = DiscoveryNodeUtils.create(masterNode.getId(), masterNode.getAddress(), masterNode.getVersionInformation());
                 nodesBuilder.add(masterNode);
                 nodesBuilder.masterNodeId(masterNode.getId());
                 final ClusterState.Builder builder = ClusterState.builder(clusterService.state()).nodes(nodesBuilder);
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java
@@ -9,7 +9,6 @@
 package org.elasticsearch.cluster.metadata;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.support.ActiveShardCount;
@@ -98,15 +97,11 @@ public void testInvalidValues() {
 
     private static final AtomicInteger nodeIdGenerator = new AtomicInteger();
 
-    protected DiscoveryNode createNode(Version version, DiscoveryNodeRole... mustHaveRoles) {
+    protected DiscoveryNode createNode(DiscoveryNodeRole... mustHaveRoles) {
         Set<DiscoveryNodeRole> roles = new HashSet<>(randomSubsetOf(DiscoveryNodeRole.roles()));
         Collections.addAll(roles, mustHaveRoles);
         final String id = Strings.format("node_%03d", nodeIdGenerator.incrementAndGet());
-        return DiscoveryNodeUtils.builder(id).name(id).roles(roles).version(version).build();
-    }
-
-    protected DiscoveryNode createNode(DiscoveryNodeRole... mustHaveRoles) {
-        return createNode(Version.CURRENT, mustHaveRoles);
+        return DiscoveryNodeUtils.builder(id).name(id).roles(roles).build();
     }
 
     /**
diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
@@ -247,7 +247,7 @@ public void testDiscoveryNodeToString() {
         assertThat(toString, containsString("{" + node.getEphemeralId() + "}"));
         assertThat(toString, containsString("{" + node.getAddress() + "}"));
         assertThat(toString, containsString("{IScdfhilmrstvw}"));// roles
-        assertThat(toString, containsString("{" + node.getVersion() + "}"));
+        assertThat(toString, containsString("{" + node.getBuildVersion() + "}"));
         assertThat(toString, containsString("{test-attr=val}"));// attributes
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
@@ -130,8 +130,7 @@ public void testRandomClusterPromotesNewestReplica() throws InterruptedException
 
         // Log the node versions (for debugging if necessary)
         for (DiscoveryNode discoveryNode : state.nodes().getDataNodes().values()) {
-            Version nodeVer = discoveryNode.getVersion();
-            logger.info("--> node [{}] has version [{}]", discoveryNode.getId(), nodeVer);
+            logger.info("--> node [{}] has version [{}]", discoveryNode.getId(), discoveryNode.getBuildVersion());
         }
 
         // randomly create some indices
diff --git a/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java
@@ -10,7 +10,6 @@
 package org.elasticsearch.rest.action.document;
 
 import org.apache.lucene.util.SetOnce;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
@@ -55,10 +54,10 @@ public void testCreateOpTypeValidation() {
     }
 
     public void testAutoIdDefaultsToOptypeCreate() {
-        checkAutoIdOpType(Version.CURRENT, DocWriteRequest.OpType.CREATE);
+        checkAutoIdOpType(DocWriteRequest.OpType.CREATE);
     }
 
-    private void checkAutoIdOpType(Version minClusterVersion, DocWriteRequest.OpType expectedOpType) {
+    private void checkAutoIdOpType(DocWriteRequest.OpType expectedOpType) {
         SetOnce<Boolean> executeCalled = new SetOnce<>();
         verifyingClient.setExecuteVerifier((actionType, request) -> {
             assertThat(request, instanceOf(IndexRequest.class));
@@ -71,9 +70,7 @@ private void checkAutoIdOpType(Version minClusterVersion, DocWriteRequest.OpType
             .withContent(new BytesArray("{}"), XContentType.JSON)
             .build();
         clusterStateSupplier.set(
-            ClusterState.builder(ClusterName.DEFAULT)
-                .nodes(DiscoveryNodes.builder().add(DiscoveryNodeUtils.builder("test").version(minClusterVersion).build()).build())
-                .build()
+            ClusterState.builder(ClusterName.DEFAULT).nodes(DiscoveryNodes.builder().add(DiscoveryNodeUtils.create("test")).build()).build()
         );
         dispatchRequest(autoIdRequest);
         assertThat(executeCalled.get(), equalTo(true));
diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java
@@ -194,7 +194,7 @@ protected void submitReconcileTask(DesiredBalance desiredBalance) {
     protected static Set<DiscoveryNodeRole> MASTER_DATA_ROLES = Set.of(DiscoveryNodeRole.MASTER_ROLE, DiscoveryNodeRole.DATA_ROLE);
 
     protected static DiscoveryNode newNode(String nodeId) {
-        return newNode(nodeId, (Version) null);
+        return DiscoveryNodeUtils.builder(nodeId).roles(MASTER_DATA_ROLES).build();
     }
 
     protected static DiscoveryNode newNode(String nodeName, String nodeId, Map<String, String> attributes) {
diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeUtils.java b/test/framework/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeUtils.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.env.BuildVersion;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.node.Node;
 
@@ -36,10 +37,15 @@ public static DiscoveryNode create(String id, TransportAddress address) {
         return builder(id).address(address).build();
     }
 
+    @Deprecated
     public static DiscoveryNode create(String id, TransportAddress address, Version version) {
         return builder(id).address(address).version(version).build();
     }
 
+    public static DiscoveryNode create(String id, TransportAddress address, VersionInformation version) {
+        return builder(id).address(address).version(version).build();
+    }
+
     public static DiscoveryNode create(String id, TransportAddress address, Map<String, String> attributes, Set<DiscoveryNodeRole> roles) {
         return builder(id).address(address).attributes(attributes).roles(roles).build();
     }
@@ -67,6 +73,7 @@ public static class Builder {
         private TransportAddress address;
         private Map<String, String> attributes = Map.of();
         private Set<DiscoveryNodeRole> roles = DiscoveryNodeRole.roles();
+        private BuildVersion buildVersion;
         private Version version;
         private IndexVersion minIndexVersion;
         private IndexVersion maxIndexVersion;
@@ -107,19 +114,33 @@ public Builder roles(Set<DiscoveryNodeRole> roles) {
             return this;
         }
 
+        @Deprecated
         public Builder version(Version version) {
             this.version = version;
             return this;
         }
 
+        @Deprecated
         public Builder version(Version version, IndexVersion minIndexVersion, IndexVersion maxIndexVersion) {
+            this.buildVersion = BuildVersion.fromVersionId(version.id());
             this.version = version;
             this.minIndexVersion = minIndexVersion;
             this.maxIndexVersion = maxIndexVersion;
             return this;
         }
 
+        public Builder version(BuildVersion version, IndexVersion minIndexVersion, IndexVersion maxIndexVersion) {
+            // see comment in VersionInformation
+            assert version.equals(BuildVersion.current());
+            this.buildVersion = version;
+            this.version = Version.CURRENT;
+            this.minIndexVersion = minIndexVersion;
+            this.maxIndexVersion = maxIndexVersion;
+            return this;
+        }
+
         public Builder version(VersionInformation versions) {
+            this.buildVersion = versions.buildVersion();
             this.version = versions.nodeVersion();
             this.minIndexVersion = versions.minIndexVersion();
             this.maxIndexVersion = versions.maxIndexVersion();
@@ -152,7 +173,7 @@ public DiscoveryNode build() {
             if (minIndexVersion == null || maxIndexVersion == null) {
                 versionInfo = VersionInformation.inferVersions(version);
             } else {
-                versionInfo = new VersionInformation(version, minIndexVersion, maxIndexVersion);
+                versionInfo = new VersionInformation(buildVersion, version, minIndexVersion, maxIndexVersion);
             }
 
             return new DiscoveryNode(name, id, ephemeralId, hostName, hostAddress, address, attributes, roles, versionInfo, externalId);
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/AbstractClusterStateLicenseServiceTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/AbstractClusterStateLicenseServiceTestCase.java
diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/persistence/AbstractProfilingPersistenceManager.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/persistence/AbstractProfilingPersistenceManager.java
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SimpleSecurityNetty4ServerTransportTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SimpleSecurityNetty4ServerTransportTests.java

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public void testClusterStateDiffSerialization() throws Exception {`
`147`	`147`	`for (Map.Entry<String, DiscoveryNode> node : clusterStateFromDiffs.nodes().getNodes().entrySet()) {`
`148`	`148`	`DiscoveryNode node1 = clusterState.nodes().get(node.getKey());`
`149`	`149`	`DiscoveryNode node2 = clusterStateFromDiffs.nodes().get(node.getKey());`
`150`		`- assertThat(node1.getVersion(), equalTo(node2.getVersion()));`
	`150`	`+ assertThat(node1.getBuildVersion(), equalTo(node2.getBuildVersion()));`
`151`	`151`	`assertThat(node1.getAddress(), equalTo(node2.getAddress()));`
`152`	`152`	`assertThat(node1.getAttributes(), equalTo(node2.getAttributes()));`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,13 @@ public boolean hasByName(String name) {`
`339`	`339`	`return false;`
`340`	`340`	`}`
`341`	`341`
	`342`	`+ /**`
	`343`	`+ * {@code true} if this cluster consists of nodes with several release versions`
	`344`	`+ */`
	`345`	`+ public boolean isMixedVersionCluster() {`
	`346`	`+ return minNodeVersion.equals(maxNodeVersion) == false;`
	`347`	`+ }`
	`348`	`+`
`342`	`349`	`/**`
`343`	`350`	`* Returns the version of the node with the oldest version in the cluster that is not a client node`
`344`	`351`	`*`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ Table buildTable(`
`367`	`367`	`table.addCell("-");`
`368`	`368`	`}`
`369`	`369`
`370`		`- table.addCell(node.getVersion().toString());`
	`370`	`+ table.addCell(node.getBuildVersion().toString());`
`371`	`371`	`table.addCell(info == null ? null : info.getBuild().type().displayName());`
`372`	`372`	`table.addCell(info == null ? null : info.getBuild().hash());`
`373`	`373`	`table.addCell(jvmInfo == null ? null : jvmInfo.version());`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public void testDiscoveryNodeToString() {`
`247`	`247`	`assertThat(toString, containsString("{" + node.getEphemeralId() + "}"));`
`248`	`248`	`assertThat(toString, containsString("{" + node.getAddress() + "}"));`
`249`	`249`	`assertThat(toString, containsString("{IScdfhilmrstvw}"));// roles`
`250`		`- assertThat(toString, containsString("{" + node.getVersion() + "}"));`
	`250`	`+ assertThat(toString, containsString("{" + node.getBuildVersion() + "}"));`
`251`	`251`	`assertThat(toString, containsString("{test-attr=val}"));// attributes`
`252`	`252`	`}`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,7 @@ public void testRandomClusterPromotesNewestReplica() throws InterruptedException`
`130`	`130`
`131`	`131`	`// Log the node versions (for debugging if necessary)`
`132`	`132`	`for (DiscoveryNode discoveryNode : state.nodes().getDataNodes().values()) {`
`133`		`- Version nodeVer = discoveryNode.getVersion();`
`134`		`- logger.info("--> node [{}] has version [{}]", discoveryNode.getId(), nodeVer);`
	`133`	`+ logger.info("--> node [{}] has version [{}]", discoveryNode.getId(), discoveryNode.getBuildVersion());`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`// randomly create some indices`