[accumulo] branch elasticity updated: Modify ServerContextTest, AccumuloDataVersion so that branch builds (#3794)

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/elasticity by this push:
     new dd619f979a Modify ServerContextTest, AccumuloDataVersion so that 
branch builds (#3794)
dd619f979a is described below

commit dd619f979aea5ff0c1782fe1d601bb57e47c62f7
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Sep 29 14:49:06 2023 -0400

    Modify ServerContextTest, AccumuloDataVersion so that branch builds (#3794)
---
 .../main/java/org/apache/accumulo/server/AccumuloDataVersion.java   | 4 ++--
 .../src/test/java/org/apache/accumulo/server/ServerContextTest.java | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java 
b/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
index b140fe6d62..8d60990a74 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
@@ -78,8 +78,8 @@ public class AccumuloDataVersion {
   }
 
   // TODO - this disables upgrades until 
https://github.com/apache/accumulo/issues/3768 is done
-  // public static final Set<Integer> CAN_RUN = 
Set.of(ROOT_TABLET_META_CHANGES,
-  // REMOVE_DEPRECATIONS_FOR_VERSION_3, CURRENT_VERSION);
+  // public static final Set<Integer> CAN_RUN = Set.of(
+  // REMOVE_DEPRECATIONS_FOR_VERSION_3, METADATA_FILE_JSON_ENCODING, 
CURRENT_VERSION);
   public static final Set<Integer> CAN_RUN = Set.of(CURRENT_VERSION);
 
   /**
diff --git 
a/server/base/src/test/java/org/apache/accumulo/server/ServerContextTest.java 
b/server/base/src/test/java/org/apache/accumulo/server/ServerContextTest.java
index 6823c62b51..7694b34166 100644
--- 
a/server/base/src/test/java/org/apache/accumulo/server/ServerContextTest.java
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/ServerContextTest.java
@@ -135,7 +135,11 @@ public class ServerContextTest {
     // ensure this fails with older versions; the oldest supported version is 
hard-coded here
     // to ensure we don't unintentionally break upgrade support; changing this 
should be a conscious
     // decision and this check will ensure we don't overlook it
-    final int oldestSupported = 
AccumuloDataVersion.METADATA_FILE_JSON_ENCODING;
+
+    final int oldestSupported = 
AccumuloDataVersion.ONDEMAND_TABLETS_FOR_VERSION_4;
+    // ELASTICITY_TODO basically disable check until upgrade to 3.1 is 
supported. Should be:
+    // final int oldestSupported = 
AccumuloDataVersion.METADATA_FILE_JSON_ENCODING;
+
     final int currentVersion = AccumuloDataVersion.get();
     IntConsumer shouldPass = ServerContext::ensureDataVersionCompatible;
     IntConsumer shouldFail = v -> assertThrows(IllegalStateException.class,