This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8b1c36c4bb21b1f6745fdcd8c2f11b2479424ab1
Merge: 13c8ccf1fb 56b374d332
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Jun 25 13:53:45 2024 -0400
Merge branch 'main' into elasticity
.../java/org/apache/accumulo/manager/TabletGroupWatcher.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --cc
server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
index 33c7e790cc,bcce8524c6..6ef007449f
---
a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
@@@ -91,20 -101,22 +91,21 @@@ import org.apache.accumulo.server.manag
import org.apache.accumulo.server.manager.state.Assignment;
import org.apache.accumulo.server.manager.state.ClosableIterator;
import org.apache.accumulo.server.manager.state.DistributedStoreException;
-import org.apache.accumulo.server.manager.state.MergeInfo;
-import org.apache.accumulo.server.manager.state.MergeState;
+import org.apache.accumulo.server.manager.state.TabletGoalState;
+import org.apache.accumulo.server.manager.state.TabletManagementIterator;
+import org.apache.accumulo.server.manager.state.TabletManagementParameters;
import org.apache.accumulo.server.manager.state.TabletStateStore;
import org.apache.accumulo.server.manager.state.UnassignedTablet;
-import org.apache.accumulo.server.tablets.TabletTime;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
+import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Iterators;
+ import com.google.common.collect.Sets;
abstract class TabletGroupWatcher extends AccumuloDaemonThread {
