Fix chroot in upgrade tracker code

Author: ctubbsii

server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeProgressTracker.java

@@ -47,24 +47,21 @@ public UpgradeProgressTracker(ServerContext context) {
     this.context = requireNonNull(context, "ServerContext must be supplied");
   }
 
-  private String getZPath() {
-    return context.getZooKeeperRoot() + Constants.ZUPGRADE_PROGRESS;
-  }
-
   public synchronized void startOrContinueUpgrade() {
     var zk = context.getZooSession();
     try {
       try {
         // normally, no upgrade is in progress
         var newProgress = new UpgradeProgress(AccumuloDataVersion.getCurrentVersion(context),
             AccumuloDataVersion.get());
-        zk.create(getZPath(), newProgress.toJsonBytes(), ZooUtil.PUBLIC, CreateMode.PERSISTENT);
+        zk.create(Constants.ZUPGRADE_PROGRESS, newProgress.toJsonBytes(), ZooUtil.PUBLIC,
+            CreateMode.PERSISTENT);
         progress = newProgress;
         znodeVersion = 0;
       } catch (KeeperException.NodeExistsException e) {
         // existing upgrade must already be in progress
         var stat = new Stat();
-        var oldProgressBytes = zk.getData(getZPath(), null, stat);
+        var oldProgressBytes = zk.getData(Constants.ZUPGRADE_PROGRESS, null, stat);
         var oldProgress = UpgradeProgress.fromJsonBytes(oldProgressBytes);
         checkState(AccumuloDataVersion.get() == oldProgress.getUpgradeTargetVersion(),
             "Upgrade was already started with a different version of software (%s), expecting %s",
@@ -133,7 +130,7 @@ public synchronized void updateMetadataVersion(int newVersion) {
 
   private synchronized void storeProgress() {
     try {
-      final String zpath = getZPath();
+      final String zpath = Constants.ZUPGRADE_PROGRESS;
       final ZooSession zs = context.getZooSession();
       try {
         var stat = zs.setData(zpath, progress.toJsonBytes(), znodeVersion);
@@ -162,7 +159,7 @@ public synchronized void upgradeComplete() {
         AccumuloDataVersion.getCurrentVersion(context), AccumuloDataVersion.get());
     final ZooReaderWriter zrw = context.getZooSession().asReaderWriter();
     try {
-      zrw.recursiveDelete(getZPath(), NodeMissingPolicy.SKIP);
+      zrw.recursiveDelete(Constants.ZUPGRADE_PROGRESS, NodeMissingPolicy.SKIP);
     } catch (KeeperException e) {
       throw new IllegalStateException("Error clearing the upgrade progress", e);
     } catch (InterruptedException e) {

test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeProgressTrackerIT.java

@@ -34,10 +34,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-import java.util.UUID;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.core.volume.Volume;
@@ -69,8 +67,6 @@ public class UpgradeProgressTrackerIT {
   @TempDir
   private static File tempDir;
 
-  private static final String zRoot = ZooUtil.getRoot(InstanceId.of(UUID.randomUUID()));
-
   private static ZooKeeperTestingServer testZk = null;
   private static ZooSession zk = null;
   private static Volume volume;
@@ -81,7 +77,6 @@ public class UpgradeProgressTrackerIT {
   public static void setup() throws Exception {
     testZk = new ZooKeeperTestingServer(tempDir);
     zk = testZk.newClient();
-    zk.asReaderWriter().mkdirs(zRoot);
     volume = new VolumeImpl(new Path(tempDir.toURI()), new Configuration());
   }
 
@@ -103,7 +98,6 @@ public void beforeTest() {
     ctx = createMock(ServerContext.class);
     sd = createMock(ServerDirs.class);
     vm = createMock(VolumeManagerImpl.class);
-    expect(ctx.getZooKeeperRoot()).andReturn(zRoot).anyTimes();
     expect(ctx.getZooSession()).andReturn(zk).anyTimes();
     expect(ctx.getServerDirs()).andReturn(sd).anyTimes();
     expect(ctx.getVolumeManager()).andReturn(vm).anyTimes();
@@ -116,8 +110,7 @@ public void beforeTest() {
   @AfterEach
   public void afterTest() throws KeeperException, InterruptedException {
     verify(ctx, sd, vm);
-    zk.asReaderWriter().recursiveDelete(zRoot + Constants.ZUPGRADE_PROGRESS,
-        NodeMissingPolicy.SKIP);
+    zk.asReaderWriter().recursiveDelete(Constants.ZUPGRADE_PROGRESS, NodeMissingPolicy.SKIP);
   }
 
   private void expectVersion(int version) {
@@ -127,7 +120,7 @@ private void expectVersion(int version) {
   }
 
   private boolean upgradeNodeExists() throws KeeperException, InterruptedException {
-    return zk.exists(zRoot + Constants.ZUPGRADE_PROGRESS, null) != null;
+    return zk.exists(Constants.ZUPGRADE_PROGRESS, null) != null;
   }
 
   @Test
@@ -136,7 +129,7 @@ public void testUpgradeAlreadyStarted() throws KeeperException, InterruptedExcep
     assertFalse(upgradeNodeExists());
     var progress =
         new UpgradeProgress(AccumuloDataVersion.get() - 2, AccumuloDataVersion.get() - 1);
-    zk.create(zRoot + Constants.ZUPGRADE_PROGRESS, GSON.get().toJson(progress).getBytes(UTF_8),
+    zk.create(Constants.ZUPGRADE_PROGRESS, GSON.get().toJson(progress).getBytes(UTF_8),
         ZooUtil.PUBLIC, CreateMode.PERSISTENT);
     assertTrue(upgradeNodeExists());
     var ise =
@@ -161,7 +154,7 @@ public void testGetInitial() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get(), progress.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get(), progress.getRootVersion());
     assertEquals(AccumuloDataVersion.get(), progress.getMetadataVersion());
-    byte[] serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    byte[] serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress).getBytes(UTF_8), serialized);
   }
 
@@ -176,15 +169,15 @@ public void testUpdates() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get() - 1, progress.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get() - 1, progress.getRootVersion());
     assertEquals(AccumuloDataVersion.get() - 1, progress.getMetadataVersion());
-    byte[] serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    byte[] serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress).getBytes(UTF_8), serialized);
 
     // Test updating out of order
     assertThrows(IllegalArgumentException.class,
         () -> progressTracker.updateMetadataVersion(AccumuloDataVersion.get()));
     assertThrows(IllegalArgumentException.class,
         () -> progressTracker.updateRootVersion(AccumuloDataVersion.get()));
-    serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress).getBytes(UTF_8), serialized);
 
     progressTracker.updateZooKeeperVersion(AccumuloDataVersion.get());
@@ -195,7 +188,7 @@ public void testUpdates() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get(), progress2.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get() - 1, progress2.getRootVersion());
     assertEquals(AccumuloDataVersion.get() - 1, progress2.getMetadataVersion());
-    serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress2).getBytes(UTF_8), serialized);
 
     progressTracker.updateRootVersion(AccumuloDataVersion.get());
@@ -206,7 +199,7 @@ public void testUpdates() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get(), progress2.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get(), progress2.getRootVersion());
     assertEquals(AccumuloDataVersion.get() - 1, progress2.getMetadataVersion());
-    serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress2).getBytes(UTF_8), serialized);
 
     progressTracker.updateMetadataVersion(AccumuloDataVersion.get());
@@ -217,7 +210,7 @@ public void testUpdates() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get(), progress2.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get(), progress2.getRootVersion());
     assertEquals(AccumuloDataVersion.get(), progress2.getMetadataVersion());
-    serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress2).getBytes(UTF_8), serialized);
   }
 
@@ -232,11 +225,11 @@ public void testCompleteUpgrade() throws KeeperException, InterruptedException {
     assertEquals(AccumuloDataVersion.get(), progress.getZooKeeperVersion());
     assertEquals(AccumuloDataVersion.get(), progress.getRootVersion());
     assertEquals(AccumuloDataVersion.get(), progress.getMetadataVersion());
-    byte[] serialized = zk.asReader().getData(zRoot + Constants.ZUPGRADE_PROGRESS);
+    byte[] serialized = zk.asReader().getData(Constants.ZUPGRADE_PROGRESS);
     assertArrayEquals(GSON.get().toJson(progress).getBytes(UTF_8), serialized);
 
     progressTracker.upgradeComplete();
-    assertFalse(zk.asReader().exists(zRoot + Constants.ZUPGRADE_PROGRESS));
+    assertFalse(zk.asReader().exists(Constants.ZUPGRADE_PROGRESS));
     assertFalse(upgradeNodeExists());
   }