Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9595311B3D for ; Mon, 16 Jun 2014 15:09:52 +0000 (UTC) Received: (qmail 87642 invoked by uid 500); 16 Jun 2014 15:09:52 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87614 invoked by uid 500); 16 Jun 2014 15:09:52 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 87527 invoked by uid 99); 16 Jun 2014 15:09:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2014 15:09:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1796E9404AD; Mon, 16 Jun 2014 15:09:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Mon, 16 Jun 2014 15:09:53 -0000 Message-Id: In-Reply-To: <855d312c2f5c4a7bbf6cfb02f591ec91@git.apache.org> References: <855d312c2f5c4a7bbf6cfb02f591ec91@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6e574b0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6e574b0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6e574b0 Branch: refs/heads/master Commit: f6e574b03c5e773be5edc2b93f8400089d2ce379 Parents: b458df5 da242bc Author: Eric C. Newton Authored: Mon Jun 16 09:44:07 2014 -0400 Committer: Eric C. Newton Committed: Mon Jun 16 09:44:07 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 23 + .../org/apache/accumulo/core/Constants.java | 1 + .../apache/accumulo/core/client/Connector.java | 9 + .../client/admin/ReplicationOperations.java | 86 + .../core/client/impl/ConnectorImpl.java | 12 + .../accumulo/core/client/impl/MasterClient.java | 1 + .../core/client/impl/ReplicationClient.java | 246 ++ .../client/impl/ReplicationOperationsImpl.java | 284 +++ .../core/client/mock/MockConnector.java | 7 + .../client/replication/PeerExistsException.java | 36 + .../replication/PeerNotFoundException.java | 40 + .../core/client/replication/ReplicaSystem.java | 47 + .../replication/ReplicaSystemFactory.java | 82 + .../org/apache/accumulo/core/conf/Property.java | 37 +- .../accumulo/core/data/ConditionalMutation.java | 7 + .../org/apache/accumulo/core/data/Mutation.java | 84 +- .../core/data/thrift/MultiScanResult.java | 152 +- .../accumulo/core/data/thrift/ScanResult.java | 36 +- .../core/data/thrift/TConditionalMutation.java | 36 +- .../accumulo/core/data/thrift/TMutation.java | 181 +- .../accumulo/core/data/thrift/UpdateErrors.java | 132 +- .../core/metadata/schema/MetadataSchema.java | 97 +- .../accumulo/core/protobuf/ProtobufUtil.java | 38 + .../AccumuloReplicationReplayer.java | 32 + .../replication/PrintReplicationRecords.java | 97 + .../core/replication/ReplicaSystemHelper.java | 71 + .../ReplicationConfigurationUtil.java | 42 + .../core/replication/ReplicationConstants.java | 30 + .../core/replication/ReplicationSchema.java | 303 +++ .../core/replication/ReplicationTarget.java | 187 ++ .../core/replication/StatusFormatter.java | 187 ++ .../accumulo/core/replication/StatusUtil.java | 210 ++ .../core/replication/proto/Replication.java | 949 +++++++ .../core/replication/thrift/KeyValues.java | 456 ++++ .../thrift/RemoteReplicationErrorCode.java | 70 + .../thrift/RemoteReplicationException.java | 518 ++++ .../core/replication/thrift/Replication.java | 1917 ++++++++++++++ .../thrift/ReplicationCoordinator.java | 1119 +++++++++ .../thrift/ReplicationCoordinatorErrorCode.java | 64 + .../thrift/ReplicationCoordinatorException.java | 518 ++++ .../replication/thrift/ReplicationServicer.java | 2343 ++++++++++++++++++ .../core/replication/thrift/WalEdits.java | 456 ++++ .../apache/accumulo/core/schema/Section.java | 37 + .../thrift/ReplicationFailedException.java | 402 +++ core/src/main/protobuf/replication.proto | 26 + core/src/main/scripts/generate-protobuf.sh | 97 + core/src/main/scripts/generate-thrift.sh | 2 +- core/src/main/thrift/data.thrift | 3 +- core/src/main/thrift/replication.thrift | 63 + .../ReplicationConfigurationUtilTest.java | 82 + .../ReplicationOperationsImplTest.java | 414 ++++ .../core/replication/ReplicationSchemaTest.java | 134 + .../core/replication/ReplicationTargetTest.java | 98 + .../core/replication/StatusUtilTest.java | 57 + .../core/replication/proto/StatusTest.java | 36 + .../main/asciidoc/accumulo_user_manual.asciidoc | 2 + docs/src/main/asciidoc/chapters/replication.txt | 314 +++ .../resources/design/ACCUMULO-378-design.mdtext | 468 ++++ .../main/resources/state/replicationstatus.gv | 40 + .../main/resources/state/replicationstatus.png | Bin 0 -> 65414 bytes .../src/main/resources/state/table-lifecycle.gv | 77 + .../main/resources/state/table-lifecycle.png | Bin 0 -> 190640 bytes .../minicluster/MiniAccumuloConfig.java | 2 +- .../impl/MiniAccumuloConfigImpl.java | 10 +- server/base/pom.xml | 18 +- .../server/conf/TableConfigurationCopy.java | 77 + .../server/constraints/MetadataConstraints.java | 8 +- .../apache/accumulo/server/fs/VolumeUtil.java | 19 +- .../apache/accumulo/server/init/Initialize.java | 106 +- .../DistributedWorkQueueWorkAssignerHelper.java | 77 + .../server/replication/ReplicationTable.java | 227 ++ .../server/replication/StatusCombiner.java | 154 ++ .../server/replication/WorkAssigner.java | 42 + .../server/util/MasterMetadataUtil.java | 87 +- .../accumulo/server/util/MetadataTableUtil.java | 1 + .../server/util/ReplicationTableUtil.java | 214 ++ .../accumulo/server/util/SystemPropUtil.java | 8 +- .../server/zookeeper/DistributedWorkQueue.java | 24 +- .../replication/ReplicationTableTest.java | 132 + .../server/replication/StatusCombinerTest.java | 257 ++ .../server/util/ReplicationTableUtilTest.java | 157 ++ server/gc/pom.xml | 18 +- .../gc/GarbageCollectWriteAheadLogs.java | 280 ++- .../accumulo/gc/GarbageCollectionAlgorithm.java | 36 + .../gc/GarbageCollectionEnvironment.java | 10 + .../accumulo/gc/SimpleGarbageCollector.java | 46 + .../CloseWriteAheadLogReferences.java | 257 ++ .../gc/GarbageCollectWriteAheadLogsTest.java | 254 +- .../accumulo/gc/GarbageCollectionTest.java | 89 + .../CloseWriteAheadLogReferencesTest.java | 370 +++ server/gc/src/test/resources/log4j.properties | 3 + server/master/pom.xml | 15 +- .../java/org/apache/accumulo/master/Master.java | 34 + .../DistributedWorkQueueWorkAssigner.java | 278 +++ .../master/replication/FinishedWorkUpdater.java | 175 ++ .../MasterReplicationCoordinator.java | 107 + .../RemoveCompleteReplicationRecords.java | 217 ++ .../master/replication/ReplicationDriver.java | 108 + .../replication/SequentialWorkAssigner.java | 229 ++ .../master/replication/StatusMaker.java | 254 ++ .../replication/UnorderedWorkAssigner.java | 172 ++ .../accumulo/master/replication/WorkDriver.java | 110 + .../accumulo/master/replication/WorkMaker.java | 198 ++ .../accumulo/master/tableOps/CreateTable.java | 14 +- ...tributedWorkQueueWorkAssignerHelperTest.java | 56 + .../replication/FinishedWorkUpdaterTest.java | 170 ++ .../MasterReplicationCoordinatorTest.java | 95 + .../RemoveCompleteReplicationRecordsTest.java | 335 +++ .../replication/SequentialWorkAssignerTest.java | 424 ++++ .../master/replication/StatusMakerTest.java | 262 ++ .../replication/UnorderedWorkAssignerTest.java | 295 +++ .../master/replication/WorkMakerTest.java | 212 ++ .../master/src/test/resources/log4j.properties | 2 + server/monitor/pom.xml | 10 +- .../org/apache/accumulo/monitor/Monitor.java | 2 + .../accumulo/monitor/servlets/BasicServlet.java | 1 + .../monitor/servlets/ReplicationServlet.java | 275 ++ server/tserver/pom.xml | 22 +- .../apache/accumulo/tserver/TabletServer.java | 85 +- .../tserver/log/TabletServerLogger.java | 28 +- .../replication/AccumuloReplicaSystem.java | 696 ++++++ .../BatchWriterReplicationReplayer.java | 114 + .../replication/ReplicationProcessor.java | 180 ++ .../replication/ReplicationServicerHandler.java | 123 + .../tserver/replication/ReplicationWorker.java | 77 + .../tserver/tablet/DatafileManager.java | 26 +- .../apache/accumulo/tserver/tablet/Tablet.java | 26 +- .../replication/AccumuloReplicaSystemTest.java | 496 ++++ .../replication/ReplicationProcessorTest.java | 100 + .../tserver/src/test/resources/log4j.properties | 19 +- .../org/apache/accumulo/shell/ShellTest.java | 19 +- .../test/replication/MockReplicaSystem.java | 94 + .../ReplicationTablesPrinterThread.java | 51 + .../test/replication/CyclicReplicationIT.java | 241 ++ .../replication/MultiTserverReplicationIT.java | 114 + .../test/replication/ReplicationIT.java | 661 +++++ .../test/replication/ReplicationTest.java | 1467 +++++++++++ .../test/replication/StatusCombinerMacTest.java | 84 + .../UnorderedWorkAssignerReplicationIT.java | 657 +++++ test/src/test/resources/log4j.properties | 17 +- test/system/scalability/run.py | 9 +- 141 files changed, 25593 insertions(+), 441 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6e574b0/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ----------------------------------------------------------------------