Merge branch 'main' into zc-recursive-watchers

dlmarion · Jan 22, 2025 · f2d5e57 · f2d5e57
2 parents 19591de + 51ea14e
commit f2d5e57
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 26 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java b/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
@@ -55,17 +55,6 @@
 public class AdminUtil<T> {
   private static final Logger log = LoggerFactory.getLogger(AdminUtil.class);
 
-  private final boolean exitOnError;
-
-  /**
-   * Constructor
-   *
-   * @param exitOnError <code>System.exit(1)</code> on error if true
-   */
-  public AdminUtil(boolean exitOnError) {
-    this.exitOnError = exitOnError;
-  }
-
   /**
    * FATE transaction status, including lock information.
    */

diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -939,7 +939,7 @@ private void executeFateOpsCommand(ServerContext context, FateOpsCommand fateOps
 
     validateFateUserInput(fateOpsCommand);
 
-    AdminUtil<Admin> admin = new AdminUtil<>(true);
+    AdminUtil<Admin> admin = new AdminUtil<>();
     final String zkRoot = context.getZooKeeperRoot();
     var zTableLocksPath = context.getServerPaths().createTableLocksPath();
     String fateZkPath = zkRoot + Constants.ZFATE;

diff --git a/...ase/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java b/...ase/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
@@ -59,7 +59,7 @@ public Admin.CheckCommand.Check getCheck() {
   private static Admin.CheckCommand.CheckStatus checkTableLocks(ServerContext context,
       Admin.CheckCommand.CheckStatus status)
       throws InterruptedException, KeeperException, AccumuloException, AccumuloSecurityException {
-    final AdminUtil<Admin> admin = new AdminUtil<>(true);
+    final AdminUtil<Admin> admin = new AdminUtil<>();
     final String zkRoot = context.getZooKeeperRoot();
     final var zTableLocksPath = context.getServerPaths().createTableLocksPath();
     final String fateZkPath = zkRoot + Constants.ZFATE;

diff --git a/...c/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/...c/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -1138,14 +1138,11 @@ private void cleanUpEmptyCompactorPathInZK() {
             queue.clearIfInactive(Duration.ofMinutes(10));
           }
         } else {
-          int aliveCompactorsForGroup = 0;
           for (String compactor : compactors) {
             String cpath = compactorQueuesPath + "/" + group + "/" + compactor;
             var lockNodes = zoorw.getChildren(compactorQueuesPath + "/" + group + "/" + compactor);
             if (lockNodes.isEmpty()) {
               deleteEmpty(zoorw, cpath);
-            } else {
-              aliveCompactorsForGroup++;
             }
           }
         }

diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
@@ -76,7 +76,7 @@ public Map<String,Long> getOpTypeCounters() {
   protected static <T extends AbstractBuilder<T,U>,U extends FateMetricValues> T
       getFateMetrics(final ReadOnlyFateStore<FateMetrics<U>> fateStore, T builder) {
 
-    AdminUtil<FateMetrics<U>> admin = new AdminUtil<>(false);
+    AdminUtil<FateMetrics<U>> admin = new AdminUtil<>();
 
     List<AdminUtil.TransactionStatus> currFates =
         admin.getTransactionStatus(Map.of(fateStore.type(), fateStore), null, null, null);

diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java
@@ -19,7 +19,6 @@
 package org.apache.accumulo.manager.tableOps.create;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.accumulo.manager.tableOps.Utils.getSortedSplitsFromFile;
 
 import java.io.IOException;
 import java.util.SortedMap;

diff --git a/...r/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java b/...r/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
@@ -18,8 +18,6 @@
  */
 package org.apache.accumulo.manager.tableOps.create;
 
-import static org.apache.accumulo.manager.tableOps.Utils.getSortedSplitsFromFile;
-
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.HashMap;
 import java.util.Iterator;

diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolResizeIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolResizeIT.java
@@ -33,7 +33,6 @@
 import org.apache.accumulo.core.fate.Repo;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.server.ServerContext;
-import org.apache.accumulo.test.fate.FateTestRunner.TestEnv;
 import org.apache.accumulo.test.util.Wait;
 import org.junit.jupiter.api.Test;
 
@@ -161,7 +160,7 @@ public String getReturn() {
     }
   }
 
-  public static class PoolResizeTestEnv extends TestEnv {
+  public static class PoolResizeTestEnv extends FateTestRunner.TestEnv {
     private final AtomicInteger numWorkers = new AtomicInteger(0);
     private final CountDownLatch isReadyLatch = new CountDownLatch(1);
   }

diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
@@ -251,7 +251,7 @@ public void getFateStatus() {
 
     int maxRetries = 3;
 
-    AdminUtil<String> admin = new AdminUtil<>(false);
+    AdminUtil<String> admin = new AdminUtil<>();
 
     while (maxRetries > 0) {
 
@@ -343,7 +343,7 @@ public void getFateStatus() {
    */
   private boolean lookupFateInZookeeper(final String tableName) throws KeeperException {
 
-    AdminUtil<String> admin = new AdminUtil<>(false);
+    AdminUtil<String> admin = new AdminUtil<>();
 
     try {
 
@@ -377,7 +377,7 @@ private boolean lookupFateInZookeeper(final String tableName) throws KeeperExcep
   }
 
   private boolean lookupFateInAccumulo(final String tableName) throws KeeperException {
-    AdminUtil<String> admin = new AdminUtil<>(false);
+    AdminUtil<String> admin = new AdminUtil<>();
 
     try {
       TableId tableId = context.getTableId(tableName);

diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -229,7 +229,7 @@ public static void assertNoDanglingFateLocks(AccumuloCluster cluster) {
 
   private static FateStatus getFateStatus(AccumuloCluster cluster) {
     try {
-      AdminUtil<String> admin = new AdminUtil<>(false);
+      AdminUtil<String> admin = new AdminUtil<>();
       ServerContext context = cluster.getServerContext();
       var zk = context.getZooSession();
       MetaFateStore<String> readOnlyMFS =