Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b3358cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b3358cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b3358cb Branch: refs/heads/master Commit: 8b3358cb0f5f0e127ce9f66f2a39ebd9aa88f28a Parents: 6df7169 3fdd29f Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Apr 24 18:22:34 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Apr 24 18:22:34 2015 -0400 ---------------------------------------------------------------------- .../client/impl/ReplicationOperationsImpl.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 4 +- .../accumulo/core/metadata/RootTable.java | 1 + .../core/metadata/schema/MetadataSchema.java | 48 ++ .../core/tabletserver/log/LogEntry.java | 78 ++- .../core/metadata/MetadataTableSchemaTest.java | 47 ++ .../org/apache/accumulo/server/TabletLevel.java | 34 ++ .../apache/accumulo/server/fs/VolumeUtil.java | 22 +- .../apache/accumulo/server/init/Initialize.java | 1 + .../server/master/state/MetaDataStateStore.java | 47 +- .../master/state/MetaDataTableScanner.java | 6 +- .../master/state/TabletLocationState.java | 7 + .../server/master/state/TabletStateStore.java | 16 +- .../master/state/ZooTabletStateStore.java | 35 +- .../accumulo/server/replication/StatusUtil.java | 13 + .../accumulo/server/util/ListVolumesUsed.java | 18 +- .../server/util/MasterMetadataUtil.java | 18 +- .../accumulo/server/util/MetadataTableUtil.java | 239 +++++--- .../server/util/ReplicationTableUtil.java | 13 +- .../server/util/ReplicationTableUtilTest.java | 2 +- .../gc/GarbageCollectWriteAheadLogs.java | 499 +++++++--------- .../accumulo/gc/SimpleGarbageCollector.java | 1 - .../CloseWriteAheadLogReferences.java | 23 +- .../gc/GarbageCollectWriteAheadLogsTest.java | 567 ------------------- .../CloseWriteAheadLogReferencesTest.java | 151 +---- .../java/org/apache/accumulo/master/Master.java | 3 + .../master/MasterClientServiceHandler.java | 3 +- .../accumulo/master/TabletGroupWatcher.java | 37 +- .../accumulo/master/replication/WorkMaker.java | 1 + .../accumulo/master/state/MergeStats.java | 3 +- .../master/ReplicationOperationsImplTest.java | 9 +- .../apache/accumulo/master/TestMergeState.java | 2 +- .../master/state/RootTabletStateStoreTest.java | 4 +- .../src/main/findbugs/exclude-filter.xml | 2 +- .../server/GarbageCollectionLogger.java | 3 +- .../apache/accumulo/tserver/TabletServer.java | 182 +++--- .../apache/accumulo/tserver/log/DfsLogger.java | 14 +- .../accumulo/tserver/log/SortedLogRecovery.java | 8 +- .../tserver/log/TabletServerLogger.java | 187 +++--- .../accumulo/tserver/tablet/CommitSession.java | 3 +- .../tserver/tablet/DatafileManager.java | 4 +- .../apache/accumulo/tserver/tablet/Tablet.java | 59 +- .../tserver/tablet/TabletCommitter.java | 3 +- .../accumulo/tserver/log/LogEntryTest.java | 56 ++ .../test/performance/thrift/NullTserver.java | 6 +- .../accumulo/proxy/ProxyDurabilityIT.java | 9 +- .../test/BadDeleteMarkersCreatedIT.java | 2 +- .../org/apache/accumulo/test/BalanceIT.java | 20 +- .../org/apache/accumulo/test/CleanWalIT.java | 1 + .../accumulo/test/ConditionalWriterIT.java | 1 + .../accumulo/test/GarbageCollectWALIT.java | 81 +++ .../MissingWalHeaderCompletesRecoveryIT.java | 14 +- .../accumulo/test/NoMutationRecoveryIT.java | 178 ------ .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../org/apache/accumulo/test/UnusedWALIT.java | 144 +++++ .../java/org/apache/accumulo/test/VolumeIT.java | 17 + .../accumulo/test/functional/ReadWriteIT.java | 8 + .../accumulo/test/functional/WALSunnyDayIT.java | 250 ++++++++ .../test/functional/WatchTheWatchCountIT.java | 2 +- .../test/performance/RollWALPerformanceIT.java | 126 +++++ ...bageCollectorCommunicatesWithTServersIT.java | 35 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../test/replication/ReplicationIT.java | 370 ++++-------- 63 files changed, 1857 insertions(+), 1888 deletions(-) ----------------------------------------------------------------------