Skip to content

Commit eb8f171

Browse files
committed
Log cluster UUID when committed (#42065)
Today we do not expose the cluster UUID in any logs by default, but it would be useful to see it. For instance if a user starts multiple nodes as separate clusters then they will silently remain as separate clusters even if they are subsequently reconfigured to look like a single cluster. This change logs the committed cluster UUID the first time the node encounters it.
1 parent 07adb3a commit eb8f171

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationState.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ default void markLastAcceptedStateAsCommitted() {
494494
metaDataBuilder = MetaData.builder(lastAcceptedState.metaData());
495495
}
496496
metaDataBuilder.clusterUUIDCommitted(true);
497+
logger.info("cluster UUID set to [{}]", lastAcceptedState.metaData().clusterUUID());
497498
}
498499
if (metaDataBuilder != null) {
499500
setLastAcceptedState(ClusterState.builder(lastAcceptedState).metaData(metaDataBuilder).build());

server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,11 @@ protected void doStart() {
677677
coordinationState.set(new CoordinationState(settings, getLocalNode(), persistedState));
678678
peerFinder.setCurrentTerm(getCurrentTerm());
679679
configuredHostsResolver.start();
680-
VotingConfiguration votingConfiguration = coordinationState.get().getLastAcceptedState().getLastCommittedConfiguration();
680+
final ClusterState lastAcceptedState = coordinationState.get().getLastAcceptedState();
681+
if (lastAcceptedState.metaData().clusterUUIDCommitted()) {
682+
logger.info("cluster UUID [{}]", lastAcceptedState.metaData().clusterUUID());
683+
}
684+
final VotingConfiguration votingConfiguration = lastAcceptedState.getLastCommittedConfiguration();
681685
if (singleNodeDiscovery &&
682686
votingConfiguration.isEmpty() == false &&
683687
votingConfiguration.hasQuorum(Collections.singleton(getLocalNode().getId())) == false) {

server/src/main/java/org/elasticsearch/node/Node.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.elasticsearch.cluster.ClusterInfo;
4141
import org.elasticsearch.cluster.ClusterInfoService;
4242
import org.elasticsearch.cluster.ClusterModule;
43+
import org.elasticsearch.cluster.ClusterName;
4344
import org.elasticsearch.cluster.ClusterState;
4445
import org.elasticsearch.cluster.ClusterStateObserver;
4546
import org.elasticsearch.cluster.InternalClusterInfoService;
@@ -270,8 +271,9 @@ protected Node(
270271

271272
nodeEnvironment = new NodeEnvironment(tmpSettings, environment);
272273
resourcesToClose.add(nodeEnvironment);
273-
logger.info("node name [{}], node ID [{}]",
274-
NODE_NAME_SETTING.get(tmpSettings), nodeEnvironment.nodeId());
274+
logger.info("node name [{}], node ID [{}], cluster name [{}]",
275+
NODE_NAME_SETTING.get(tmpSettings), nodeEnvironment.nodeId(),
276+
ClusterName.CLUSTER_NAME_SETTING.get(tmpSettings).value());
275277

276278
final JvmInfo jvmInfo = JvmInfo.jvmInfo();
277279
logger.info(

0 commit comments

Comments
 (0)