You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2025/03/26 01:35:53 UTC
(accumulo) branch main updated (a2bc4213a0 -> 7bbd562050)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from a2bc4213a0 Protected against NPE in InstanceOperationsImpl.getServers (#5429)
add 99dc220807 Fix trivial warnings about unused/unclosed resources
new 33f9651ee7 Merge branch '2.1'
new 7bbd562050 Fix some warnings in Fate code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java | 2 --
.../src/main/java/org/apache/accumulo/manager/split/Splitter.java | 1 +
.../main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java | 2 +-
.../src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
(accumulo) 01/02: Merge branch '2.1'
Posted by ct...@apache.org.
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
commit 33f9651ee7563a6a0e0b0f2d6b28dcebf329abce
Merge: a2bc4213a0 99dc220807
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Mar 25 21:18:08 2025 -0400
Merge branch '2.1'
(accumulo) 02/02: Fix some warnings in Fate code
Posted by ct...@apache.org.
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
commit 7bbd5620507add66c9313822729b8acc55110e82
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Mar 25 21:32:34 2025 -0400
Fix some warnings in Fate code
---
.../src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java | 2 --
.../src/main/java/org/apache/accumulo/manager/split/Splitter.java | 1 +
.../main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java | 2 +-
.../src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
index de292ec0c4..311c2890dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
@@ -54,11 +54,9 @@ import org.apache.accumulo.core.fate.Fate.TxInfo;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateKey;
-import org.apache.accumulo.core.fate.FateKey.FateKeyType;
import org.apache.accumulo.core.fate.ReadOnlyRepo;
import org.apache.accumulo.core.fate.Repo;
import org.apache.accumulo.core.fate.StackOverflowException;
-import org.apache.accumulo.core.fate.user.FateMutator.Status;
import org.apache.accumulo.core.fate.user.schema.FateSchema.RepoColumnFamily;
import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
import org.apache.accumulo.core.fate.user.schema.FateSchema.TxInfoColumnFamily;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java b/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java
index d88e52ed66..724615f41e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java
@@ -105,6 +105,7 @@ public class Splitter {
if (!splits.isEmpty()) {
try (var seeder = manager.fate(instanceType).beginSeeding()) {
for (KeyExtent extent : splits.values()) {
+ @SuppressWarnings("unused")
var unused = seeder.attemptToSeedTransaction(Fate.FateOperation.SYSTEM_SPLIT,
FateKey.forSplit(extent), new FindSplits(extent), true);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
index f798e0d93d..ba01be9990 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
@@ -67,7 +67,7 @@ import com.google.common.collect.Iterators;
public abstract class FateExecutionOrderIT extends SharedMiniClusterBase
implements FateTestRunner<FateExecutionOrderIT.FeoTestEnv> {
- public static class FeoTestEnv extends TestEnv {
+ public static class FeoTestEnv extends FateTestRunner.TestEnv {
private final AccumuloClient client;
public FeoTestEnv(AccumuloClient client) {
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java
index 1245b24e47..51993a564b 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherIT.java
@@ -714,7 +714,7 @@ public abstract class FatePoolsWatcherIT 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/fate/FateTestRunner.java b/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
index dc9b7d22fc..1b8ac0ab6b 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
@@ -43,7 +43,7 @@ public interface FateTestRunner<T extends TestEnv> {
void execute(FateStore<T> store, ServerContext sctx) throws Exception;
}
- class TestEnv {
+ static class TestEnv {
}
}