(accumulo) branch main updated: removes unused zookeeper nodes in upgrade (#4712)

[kturner]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 97f2f624ee removes unused zookeeper nodes in upgrade (#4712)
97f2f624ee is described below

commit 97f2f624ee06af58a1ad3fcb1a275e643d59869e
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Jul 22 16:32:11 2024 -0400

    removes unused zookeeper nodes in upgrade (#4712)
---
 core/src/main/java/org/apache/accumulo/core/Constants.java       | 4 ----
 .../java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java | 9 ++++++++-
 .../org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java  | 5 +++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java 
b/core/src/main/java/org/apache/accumulo/core/Constants.java
index dd5b7d2f7a..411af753cf 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -62,8 +62,6 @@ public class Constants {
   public static final String ZMONITOR_LOCK = ZMONITOR + "/lock";
   public static final String ZMONITOR_HTTP_ADDR = ZMONITOR + "/http_addr";
 
-  // used by < 2.1 table and namespace configurations
-  public static final String ZCONF_LEGACY = "/conf";
   public static final String ZCONFIG = "/config";
 
   public static final String ZTSERVERS = "/tservers";
@@ -78,8 +76,6 @@ public class Constants {
   public static final String ZDEAD = "/dead";
   public static final String ZDEADTSERVERS = ZDEAD + "/tservers";
 
-  public static final String ZTRACERS = "/tracers";
-
   public static final String ZPROBLEMS = "/problems";
 
   public static final String BULK_ARBITRATOR_TYPE = "bulkTx";
diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
index 0c5e086549..ffeaf9a015 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
@@ -69,13 +69,20 @@ public class Upgrader11to12 implements Upgrader {
   static final Set<Text> UPGRADE_FAMILIES =
       Set.of(DataFileColumnFamily.NAME, CHOPPED, 
ExternalCompactionColumnFamily.NAME);
 
+  public static final String ZTRACERS = "/tracers";
+
   @Override
   public void upgradeZookeeper(@NonNull ServerContext context) {
     log.debug("Upgrade ZooKeeper: upgrading to data version {}", 
METADATA_FILE_JSON_ENCODING);
-    var rootBase = ZooUtil.getRoot(context.getInstanceID()) + ZROOT_TABLET;
+    var zooRoot = ZooUtil.getRoot(context.getInstanceID());
+    var rootBase = zooRoot + ZROOT_TABLET;
 
     try {
       var zrw = context.getZooReaderWriter();
+
+      // clean up nodes no longer in use
+      zrw.recursiveDelete(zooRoot + ZTRACERS, ZooUtil.NodeMissingPolicy.SKIP);
+
       Stat stat = new Stat();
       byte[] rootData = zrw.getData(rootBase, stat);
 
diff --git 
a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
 
b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
index 14d19de465..d176a4c56c 100644
--- 
a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
+++ 
b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
@@ -50,6 +50,7 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.metadata.StoredTabletFile;
 import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ChoppedColumnFamily;
 import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
@@ -366,6 +367,10 @@ public class Upgrader11to12Test {
     expect(zrw.overwritePersistentData(eq("/accumulo/" + iid.canonical() + 
"/root_tablet"),
         capture(byteCapture), eq(123))).andReturn(true).once();
 
+    zrw.recursiveDelete("/accumulo/" + iid.canonical() + "/tracers",
+        ZooUtil.NodeMissingPolicy.SKIP);
+    expectLastCall().once();
+
     replay(context, zrw);
 
     upgrader.upgradeZookeeper(context);