Adapt BWC layer checks for Exceptions to include v5.0.2 support

ywelsch · ywelsch · commit 05529d9fef16 · 2016-11-22T12:15:12.000+01:00
The PR #21694 was initially planned to go into v6.0.0 and v5.1.0. Due to another PR relying on this one though for backport to v5.0.2, #21694 must go to v5.0.2 as well. As such, the initial backward compatibility rules established by the PR must be changed to include v5.0.2 and above.
diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -50,6 +50,7 @@
  */
 public class ElasticsearchException extends RuntimeException implements ToXContent, Writeable {
 
+    public static final Version V_5_0_2_UNRELEASED = Version.fromId(5000299);
     public static final Version UNKNOWN_VERSION_ADDED = Version.fromId(0);
     public static final String REST_EXCEPTION_SKIP_CAUSE = "rest.exception.cause.skip";
     public static final String REST_EXCEPTION_SKIP_STACK_TRACE = "rest.exception.stacktrace.skip";
@@ -711,9 +712,9 @@ enum ElasticsearchExceptionHandle {
         STATUS_EXCEPTION(org.elasticsearch.ElasticsearchStatusException.class, org.elasticsearch.ElasticsearchStatusException::new, 145,
             UNKNOWN_VERSION_ADDED),
         TASK_CANCELLED_EXCEPTION(org.elasticsearch.tasks.TaskCancelledException.class,
-            org.elasticsearch.tasks.TaskCancelledException::new, 146, UNKNOWN_VERSION_ADDED),
+            org.elasticsearch.tasks.TaskCancelledException::new, 146, Version.V_5_1_0),
         SHARD_LOCK_OBTAIN_FAILED_EXCEPTION(org.elasticsearch.env.ShardLockObtainFailedException.class,
-                                           org.elasticsearch.env.ShardLockObtainFailedException::new, 147, Version.V_5_1_0);
+                                           org.elasticsearch.env.ShardLockObtainFailedException::new, 147, V_5_0_2_UNRELEASED);
 
 
         final Class<? extends ElasticsearchException> exceptionClass;
diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
@@ -865,7 +865,11 @@ public void testElasticsearchRemoteException() throws IOException {
     public void testShardLockObtainFailedException() throws IOException {
         ShardId shardId = new ShardId("foo", "_na_", 1);
         ShardLockObtainFailedException orig = new ShardLockObtainFailedException(shardId, "boom");
-        Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_1_0, Version.CURRENT);
+        Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.CURRENT);
+        if (version.before(ElasticsearchException.V_5_0_2_UNRELEASED)) {
+            // remove this once 5_0_2 is released randomVersionBetween asserts that this version is in the constant table.
+            version = ElasticsearchException.V_5_0_2_UNRELEASED;
+        }
         ShardLockObtainFailedException ex = serialize(orig, version);
         assertEquals(orig.getMessage(), ex.getMessage());
         assertEquals(orig.getShardId(), ex.getShardId());
@@ -874,7 +878,7 @@ public void testShardLockObtainFailedException() throws IOException {
     public void testBWCShardLockObtainFailedException() throws IOException {
         ShardId shardId = new ShardId("foo", "_na_", 1);
         ShardLockObtainFailedException orig = new ShardLockObtainFailedException(shardId, "boom");
-        Exception ex = serialize((Exception)orig, Version.V_5_0_0);
+        Exception ex = serialize((Exception)orig, randomFrom(Version.V_5_0_0, Version.V_5_0_1));
         assertThat(ex, instanceOf(NotSerializableExceptionWrapper.class));
         assertEquals("shard_lock_obtain_failed_exception: [foo][1]: boom", ex.getMessage());
     }
diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java
@@ -267,6 +267,8 @@ public void testLuceneVersionIsSameOnMinorRelease() {
     // see comment in Version.java about this test
     public void testUnknownVersions() {
         assertUnknownVersion(V_20_0_0_UNRELEASED);
+        // once we release 5.0.2 and it's added to Version.java we need to remove this constant
+        assertUnknownVersion(ElasticsearchException.V_5_0_2_UNRELEASED);
         expectThrows(AssertionError.class, () -> assertUnknownVersion(Version.CURRENT));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,8 @@ public void testLuceneVersionIsSameOnMinorRelease() {`
`267`	`267`	`// see comment in Version.java about this test`
`268`	`268`	`public void testUnknownVersions() {`
`269`	`269`	`assertUnknownVersion(V_20_0_0_UNRELEASED);`
	`270`	`+ // once we release 5.0.2 and it's added to Version.java we need to remove this constant`
	`271`	`+ assertUnknownVersion(ElasticsearchException.V_5_0_2_UNRELEASED);`
`270`	`272`	`expectThrows(AssertionError.class, () -> assertUnknownVersion(Version.CURRENT));`
`271`	`273`	`}`
`272`	`274`