Update exception messages to match changes

williamrandolph · Nov 15, 2023 · 7d8bde5 · 7d8bde5
1 parent ceb9dce
commit 7d8bde5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
@@ -126,7 +126,7 @@ public void testFailsToStartIfDowngraded() {
         );
         assertThat(
             illegalStateException.getMessage(),
-            allOf(startsWith("cannot downgrade a node from version ["), endsWith("] to version [" + Build.current().version() + "]"))
+            allOf(startsWith("cannot downgrade a node using index version ["), endsWith("] to version [" + Build.current().version() + "]"))
         );
     }
 
@@ -137,7 +137,7 @@ public void testFailsToStartIfUpgradedTooFar() {
         assertThat(
             illegalStateException.getMessage(),
             allOf(
-                startsWith("cannot upgrade a node from version ["),
+                startsWith("cannot upgrade a node using index version ["),
                 endsWith(
                     "] directly to version ["
                         + Build.current().version()

diff --git a/server/src/main/java/org/elasticsearch/env/NodeMetadata.java b/server/src/main/java/org/elasticsearch/env/NodeMetadata.java
@@ -116,9 +116,8 @@ public void verifyUpgradeToCurrentVersion() {
             : "version is required in the node metadata from v9 onwards";
 
         if (nodeIndexVersion.before(IndexVersions.MINIMUM_IN_PLACE_UPGRADE_COMPATIBLE)) {
-            // TODO[wrb]: fix message
             throw new IllegalStateException(
-                "cannot upgrade a node from version ["
+                "cannot upgrade a node using index version ["
                     + nodeIndexVersion
                     + "] directly to version ["
                     + Build.current().version()
@@ -130,9 +129,8 @@ public void verifyUpgradeToCurrentVersion() {
         }
 
         if (nodeIndexVersion.after(IndexVersion.current())) {
-            // TODO[wrb]: fix message
             throw new IllegalStateException(
-                "cannot downgrade a node from version [" + nodeIndexVersion + "] to version [" + Build.current().version() + "]"
+                "cannot downgrade a node using index version [" + nodeIndexVersion + "] to version [" + Build.current().version() + "]"
             );
         }
     }

diff --git a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
@@ -628,7 +628,7 @@ public void testIndexCompatibilityChecks() throws IOException {
             assertThat(
                 ex.getMessage(),
                 allOf(
-                    startsWith("cannot upgrade a node from version [" + oldVersion.id() + "] directly"),
+                    startsWith("cannot upgrade a node using index version [" + oldVersion.id() + "] directly"),
                     containsString("upgrade to version [" + Build.current().minWireCompatVersion())
                 )
             );

diff --git a/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java b/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java
@@ -114,7 +114,7 @@ public void testUpgradesMissingVersion() {
         assertThat(
             illegalStateException.getMessage(),
             startsWith(
-                "cannot upgrade a node from version [" + IndexVersions.ZERO + "] directly to version [" + Build.current().version() + "]"
+                "cannot upgrade a node using index version [" + IndexVersions.ZERO + "] directly to version [" + Build.current().version() + "]"
             )
         );
     }
@@ -126,7 +126,7 @@ public void testDoesNotUpgradeFutureVersion() {
         );
         assertThat(
             illegalStateException.getMessage(),
-            allOf(startsWith("cannot downgrade a node from version ["), endsWith("] to version [" + Build.current().version() + "]"))
+            allOf(startsWith("cannot downgrade a node using index version ["), endsWith("] to version [" + Build.current().version() + "]"))
         );
     }
 
@@ -138,7 +138,7 @@ public void testDoesNotUpgradeAncientVersion() {
         assertThat(
             illegalStateException.getMessage(),
             allOf(
-                startsWith("cannot upgrade a node from version ["),
+                startsWith("cannot upgrade a node using index version ["),
                 endsWith(
                     "] directly to version ["
                         + Build.current().version()