This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 540179d1f5 Alternate time wait calculation using nanos (#3244)
add 491497435d Fix unused variable warning
add 7d69842000 Merge branch '2.1'
add d6daafd894 Do not calculate split point in Tablet.needsSplit() (#3221)
add d61ba8ea3a Avoids holding tablet lock while doing split computations
(#3249)
add aa474b9de5 Merge branch '1.10' into 2.1
add 8dd79a3b31 fixes NPE introduced in #3249
add 1864fe50fc Merge branch '1.10' into 2.1
add ecbff2e602 Merge branch '2.1'
add fe2d201685 Refactor TabletMetadata.Location to encapsulate
TServerInstance (#3257)
add c8cd5809f9 Merge branch '2.1'
No new revisions were added by this update.
Summary of changes:
.../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 | 12 +-
.../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 +-
.../org/apache/accumulo/tserver/TabletServer.java | 2 +-
.../accumulo/tserver/UnloadTabletHandler.java | 4 +-
.../accumulo/tserver/tablet/DatafileManager.java | 4 +-
.../tserver/tablet/MinorCompactionTask.java | 2 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 239 ++++++++++++++-------
.../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 +-
35 files changed, 436 insertions(+), 229 deletions(-)