This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d4846d407e5b28482394e2c0baa16932ae35e086 Merge: ffe0018b51 9bbf42f4dc Author: Dave Marion <[email protected]> AuthorDate: Mon Jul 10 16:13:51 2023 +0000 Merge branch '2.1' .../hadoopImpl/mapred/AccumuloRecordWriter.java | 2 +- .../hadoopImpl/mapreduce/AccumuloRecordWriter.java | 2 +- .../manager/state/LoggingTabletStateStore.java | 6 + .../server/manager/state/MetaDataStateStore.java | 15 +- .../server/manager/state/RootTabletStateStore.java | 5 +- .../server/manager/state/TabletStateStore.java | 11 +- .../server/manager/state/ZooTabletStateStore.java | 10 +- .../manager/state/RootTabletStateStoreTest.java | 3 +- .../accumulo/manager/TabletGroupWatcher.java | 49 +++++- .../apache/accumulo/manager/state/TableCounts.java | 9 ++ .../apache/accumulo/manager/state/TableStats.java | 6 + .../manager/tserverOps/ShutdownTServer.java | 3 + .../org/apache/accumulo/tserver/TabletServer.java | 1 + .../accumulo/tserver/UnloadTabletHandler.java | 1 + .../accumulo/tserver/session/ScanSession.java | 4 + .../apache/accumulo/tserver/session/Session.java | 6 + .../accumulo/tserver/session/SessionManager.java | 83 ++++++---- .../org/apache/accumulo/tserver/tablet/Tablet.java | 14 +- .../test/functional/ManagerAssignmentIT.java | 167 +++++++++++++++++++++ test/src/main/resources/log4j2-test.properties | 3 + 20 files changed, 351 insertions(+), 49 deletions(-) diff --cc server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java index b5b16e61d4,84c62254ca..acfb363d2b --- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java +++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java @@@ -26,10 -26,10 +26,11 @@@ import java.util.concurrent.TimeUnit import org.apache.accumulo.core.logging.TabletLogger; import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.TabletLocationState; + import org.apache.accumulo.core.metadata.schema.Ample.DataLevel; -import org.apache.accumulo.core.util.HostAndPort; import org.apache.hadoop.fs.Path; +import com.google.common.net.HostAndPort; + /** * Wraps a tablet state store and logs important events. */ diff --cc server/base/src/main/java/org/apache/accumulo/server/manager/state/ZooTabletStateStore.java index 6b31568c9e,398e67c112..a2b28e1d71 --- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/ZooTabletStateStore.java +++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/ZooTabletStateStore.java @@@ -28,8 -28,8 +28,9 @@@ import org.apache.accumulo.core.clientI import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.TabletLocationState; +import org.apache.accumulo.core.metadata.TabletLocationState.BadLocationStateException; import org.apache.accumulo.core.metadata.schema.Ample; + import org.apache.accumulo.core.metadata.schema.Ample.DataLevel; import org.apache.accumulo.core.metadata.schema.Ample.ReadConsistency; import org.apache.accumulo.core.metadata.schema.Ample.TabletMutator; import org.apache.accumulo.core.metadata.schema.TabletMetadata; diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java index 7f32b7bfda,f0f8a5de2a..75f1c5f99b --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java @@@ -18,8 -18,11 +18,11 @@@ */ package org.apache.accumulo.tserver.session; + import static java.util.concurrent.TimeUnit.MILLISECONDS; + import static java.util.concurrent.TimeUnit.MINUTES; + import static java.util.concurrent.TimeUnit.SECONDS; +import static org.apache.accumulo.core.util.LazySingletons.RANDOM; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@@ -39,10 -45,11 +45,11 @@@ import org.apache.accumulo.core.conf.Pr import org.apache.accumulo.core.data.Column; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.dataImpl.thrift.MultiScanResult; -import org.apache.accumulo.core.tabletserver.thrift.ActiveScan; -import org.apache.accumulo.core.tabletserver.thrift.ScanState; -import org.apache.accumulo.core.tabletserver.thrift.ScanType; +import org.apache.accumulo.core.tabletscan.thrift.ActiveScan; +import org.apache.accumulo.core.tabletscan.thrift.ScanState; +import org.apache.accumulo.core.tabletscan.thrift.ScanType; import org.apache.accumulo.core.util.MapCounter; + import org.apache.accumulo.core.util.Retry; import org.apache.accumulo.core.util.threads.ThreadPools; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.tserver.scan.ScanRunState; diff --cc test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java index c3fc72d242,04dc8490d2..676de69ef1 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java @@@ -31,14 -43,23 +43,24 @@@ import org.apache.accumulo.core.data.Ke import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.TableId; + import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.fate.zookeeper.ServiceLock; ++import org.apache.accumulo.core.lock.ServiceLock; import org.apache.accumulo.core.metadata.MetadataTable; + import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.metadata.TabletLocationState; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection; + import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; + import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.harness.AccumuloClusterHarness; + import org.apache.accumulo.minicluster.ServerType; + import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterControl; import org.apache.accumulo.server.manager.state.MetaDataTableScanner; + import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.Test; ++import com.google.common.net.HostAndPort; ++ public class ManagerAssignmentIT extends AccumuloClusterHarness { @Override
