(accumulo) branch main updated: Adds dry-run checks back into ZooZap (#6231)

[ddanielr]

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

ddanielr 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 09f0b08165 Adds dry-run checks back into ZooZap (#6231)
09f0b08165 is described below

commit 09f0b081658b34f95b78179b05a017260e2f43e8
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Mar 20 21:15:49 2026 -0400

    Adds dry-run checks back into ZooZap (#6231)
    
    The dry-run check was only being performed on the singletonLock delete
    code.
    The rest of the recursiveDelete actions always removed the locks.
---
 .../java/org/apache/accumulo/server/util/ZooZap.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java 
b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index d50c817811..b6e36ae692 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -145,7 +145,9 @@ public class ZooZap extends 
ServerKeywordExecutable<ZapOpts> {
             context.getServerPaths().getAssistantManagers(addressSelector, 
false);
         for (var serverLockPath : managerPaths) {
           message("Deleting manager " + serverLockPath.getServer() + " from 
zookeeper", opts);
-          zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          if (!opts.dryRun) {
+            zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          }
         }
       } catch (RuntimeException e) {
         log.error("Error deleting manager lock", e);
@@ -178,7 +180,9 @@ public class ZooZap extends 
ServerKeywordExecutable<ZapOpts> {
             context.getServerPaths().getTabletServer(rgp, addressSelector, 
false);
         for (var serverLockPath : tserverLockPaths) {
           message("Deleting tserver " + serverLockPath.getServer() + " from 
zookeeper", opts);
-          zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          if (!opts.dryRun) {
+            zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          }
         }
       } catch (KeeperException | InterruptedException e) {
         log.error("Error deleting tserver locks", e);
@@ -191,7 +195,9 @@ public class ZooZap extends 
ServerKeywordExecutable<ZapOpts> {
       try {
         for (var serverLockPath : compactorLockPaths) {
           message("Deleting compactor " + serverLockPath.getServer() + " from 
zookeeper", opts);
-          zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          if (!opts.dryRun) {
+            zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          }
         }
       } catch (KeeperException | InterruptedException e) {
         log.error("Error deleting compactors from zookeeper", e);
@@ -205,7 +211,9 @@ public class ZooZap extends 
ServerKeywordExecutable<ZapOpts> {
       try {
         for (var serverLockPath : sserverLockPaths) {
           message("Deleting sserver " + serverLockPath.getServer() + " from 
zookeeper", opts);
-          zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          if (!opts.dryRun) {
+            zrw.recursiveDelete(serverLockPath.toString(), 
NodeMissingPolicy.SKIP);
+          }
         }
       } catch (KeeperException | InterruptedException e) {
         log.error("Error deleting scan server locks", e);