This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c8cd5809f9d4e3dcecce3d330b71b7ca794723c5 Merge: ecbff2e602 fe2d201685 Author: Christopher L. Shannon (cshannon) <[email protected]> AuthorDate: Sat Mar 25 08:27:50 2023 -0400 Merge branch '2.1' .../core/metadata/TabletLocationState.java | 68 ++++++++++++----- .../accumulo/core/metadata/schema/Ample.java | 6 +- .../core/metadata/schema/TabletMetadata.java | 86 ++++++++++++++++++++-- .../core/metadata/schema/TabletMetadataTest.java | 6 +- .../manager/balancer/BalancerEnvironmentImpl.java | 5 +- .../server/manager/state/MetaDataStateStore.java | 20 ++--- .../server/manager/state/MetaDataTableScanner.java | 13 ++-- .../server/manager/state/ZooTabletStateStore.java | 21 +++--- .../server/metadata/TabletMutatorBase.java | 10 ++- .../accumulo/server/util/ManagerMetadataUtil.java | 42 +++++------ .../manager/state/RootTabletStateStoreTest.java | 10 ++- .../manager/state/TabletLocationStateTest.java | 21 +++--- .../accumulo/gc/GarbageCollectWriteAheadLogs.java | 2 +- .../gc/GarbageCollectWriteAheadLogsTest.java | 9 ++- .../java/org/apache/accumulo/manager/Manager.java | 4 +- .../manager/ManagerClientServiceHandler.java | 2 +- .../accumulo/manager/TabletGroupWatcher.java | 20 ++--- .../manager/tableOps/bulkVer2/LoadFiles.java | 3 +- .../manager/tableOps/compact/CompactionDriver.java | 2 +- .../apache/accumulo/tserver/AssignmentHandler.java | 5 +- .../accumulo/tserver/UnloadTabletHandler.java | 4 +- .../accumulo/tserver/tablet/DatafileManager.java | 4 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 8 +- .../apache/accumulo/tserver/tablet/TabletData.java | 8 +- .../shell/commands/ListTabletsCommand.java | 3 +- .../shell/commands/ListTabletsCommandTest.java | 8 +- .../test/ManagerRepairsDualAssignmentIT.java | 9 +-- .../test/functional/AssignLocationModeIT.java | 6 +- .../test/functional/CompactLocationModeIT.java | 4 +- .../test/functional/ManagerAssignmentIT.java | 6 +- .../accumulo/test/functional/SplitRecoveryIT.java | 4 +- .../apache/accumulo/test/manager/MergeStateIT.java | 7 +- .../accumulo/test/manager/SuspendedTabletsIT.java | 2 +- 33 files changed, 273 insertions(+), 155 deletions(-) diff --cc server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java index 90079a9bfc,e5ba3fec83..42179ee6cc --- a/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java @@@ -40,7 -40,9 +40,8 @@@ import org.apache.accumulo.core.metadat import org.apache.accumulo.core.metadata.schema.RootTabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; + import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.server.MockServerContext; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.metadata.TabletMutatorBase; diff --cc server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java index 7e3f8951f5,d9c69da11f..1640a72558 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java @@@ -27,8 -29,16 +27,9 @@@ import java.util.UUID import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.gc.thrift.GCStatus; import org.apache.accumulo.core.gc.thrift.GcCycleStats; -import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.TabletLocationState; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection; + import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location; -import org.apache.accumulo.core.replication.ReplicationSchema; -import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.fs.VolumeManager; diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/UnloadTabletHandler.java index a8a7aca374,0b3c611a05..145e2eb36f --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/UnloadTabletHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/UnloadTabletHandler.java @@@ -26,7 -26,8 +26,8 @@@ import org.apache.accumulo.core.manager 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.TabletMetadata.Location; -import org.apache.accumulo.core.tabletserver.thrift.TUnloadTabletGoal; +import org.apache.accumulo.core.tablet.thrift.TUnloadTabletGoal; import org.apache.accumulo.server.manager.state.DistributedStoreException; import org.apache.accumulo.server.manager.state.TabletStateStore; import org.apache.accumulo.tserver.managermessage.TabletStatusMessage; diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index e2db91be30,5c4b7d40db..3869edb124 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@@ -82,6 -80,8 +81,7 @@@ import org.apache.accumulo.core.metadat import org.apache.accumulo.core.metadata.schema.MetadataTime; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; + import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location; -import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.sample.impl.SamplerConfigurationImpl; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment; diff --cc test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java index 1bd2da768c,68aa73408b..8057c7d81e --- a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java @@@ -43,8 -43,10 +43,9 @@@ import org.apache.accumulo.core.metadat import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ChoppedColumnFamily; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.CurrentLocationColumnFamily; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily; + import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.manager.state.MergeStats; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.manager.state.Assignment;
