Reword node ID mismatch too

DaveCTurner · DaveCTurner · commit 9e89fed6f2b2 · 2021-06-07T12:50:20.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/gateway/PersistedClusterStateService.java b/server/src/main/java/org/elasticsearch/gateway/PersistedClusterStateService.java
@@ -331,8 +331,8 @@ OnDiskState loadOnDiskState(boolean checkClean) throws IOException {
                     onDiskState = loadOnDiskState(dataPath, directoryReader);
 
                     if (nodeId.equals(onDiskState.nodeId) == false) {
-                        throw new IllegalStateException("unexpected node ID in metadata, found [" + onDiskState.nodeId +
-                            "] in [" + dataPath + "] but expected [" + nodeId + "]");
+                        throw new IllegalStateException("the index containing the cluster metadata under the data path [" + dataPath +
+                            "] belongs to a node with ID [" + onDiskState.nodeId + "] but this node's ID is [" + nodeId + "]");
                     }
                 }
             } catch (IndexNotFoundException e) {

Original file line number	Diff line number	Diff line change
`@@ -331,8 +331,8 @@ OnDiskState loadOnDiskState(boolean checkClean) throws IOException {`
`331`	`331`	`onDiskState = loadOnDiskState(dataPath, directoryReader);`
`332`	`332`
`333`	`333`	`if (nodeId.equals(onDiskState.nodeId) == false) {`
`334`		`- throw new IllegalStateException("unexpected node ID in metadata, found [" + onDiskState.nodeId +`
`335`		`- "] in [" + dataPath + "] but expected [" + nodeId + "]");`
	`334`	`+ throw new IllegalStateException("the index containing the cluster metadata under the data path [" + dataPath +`
	`335`	`+ "] belongs to a node with ID [" + onDiskState.nodeId + "] but this node's ID is [" + nodeId + "]");`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`	`} catch (IndexNotFoundException e) {`