This is an automated email from the ASF dual-hosted git repository.
ctubbsii 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 51ea14e90a Remove unused code, fix import
51ea14e90a is described below
commit 51ea14e90a9927172d33bedae6ba53eebc1dcd20
Author: Christopher Tubbs <[email protected]>
AuthorDate: Wed Jan 22 15:56:09 2025 -0500
Remove unused code, fix import
Trivial fixes to remove unused imports and variables, and to fix a
missing import for FateRunnerTest.TestEnv
---
.../main/java/org/apache/accumulo/core/fate/AdminUtil.java | 11 -----------
.../src/main/java/org/apache/accumulo/server/util/Admin.java | 2 +-
.../server/util/checkCommand/TableLocksCheckRunner.java | 2 +-
.../manager/compaction/coordinator/CompactionCoordinator.java | 3 ---
.../accumulo/manager/metrics/fate/FateMetricValues.java | 2 +-
.../apache/accumulo/manager/tableOps/create/ChooseDir.java | 1 -
.../accumulo/manager/tableOps/create/PopulateMetadata.java | 2 --
.../java/org/apache/accumulo/test/fate/FatePoolResizeIT.java | 2 +-
.../apache/accumulo/test/functional/FateConcurrencyIT.java | 6 +++---
.../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +-
10 files changed, 8 insertions(+), 25 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
index c54ee85d1a..a5b1c5645a 100644
--- 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 @@ import org.slf4j.LoggerFactory;
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
index 2d8c342c36..7983b4f92a 100644
--- 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 @@ public class Admin implements KeywordExecutable {
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/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
index f8efa64c6a..58a5f68ced 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
@@ -59,7 +59,7 @@ public class TableLocksCheckRunner implements CheckRunner {
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/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 6a474d732d..d8366a8792 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -1138,14 +1138,11 @@ public class CompactionCoordinator
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
index 473f1284a5..832af64278 100644
---
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 abstract class FateMetricValues {
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
index a80bb41c82..ca60de0a23 100644
---
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/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
index c0f1ab3a9b..d487263b10 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
+++
b/server/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
index 7b429fdde0..53f529613e 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolResizeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolResizeIT.java
@@ -160,7 +160,7 @@ public abstract class FatePoolResizeIT extends
SharedMiniClusterBase
}
}
- 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
index 515f4a6213..ac2b0b7a10 100644
---
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 class FateConcurrencyIT extends
AccumuloClusterHarness {
int maxRetries = 3;
- AdminUtil<String> admin = new AdminUtil<>(false);
+ AdminUtil<String> admin = new AdminUtil<>();
while (maxRetries > 0) {
@@ -343,7 +343,7 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
*/
private boolean lookupFateInZookeeper(final String tableName) throws
KeeperException {
- AdminUtil<String> admin = new AdminUtil<>(false);
+ AdminUtil<String> admin = new AdminUtil<>();
try {
@@ -377,7 +377,7 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
}
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
index a910a040a7..da3dc24e78 100644
---
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 class FunctionalTestUtils {
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 =
