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 606A91795B for ; Fri, 7 Nov 2014 22:31:17 +0000 (UTC) Received: (qmail 74676 invoked by uid 500); 7 Nov 2014 22:31:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 74645 invoked by uid 500); 7 Nov 2014 22:31:17 -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 74606 invoked by uid 99); 7 Nov 2014 22:31:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 22:31:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD65A99DF47; Fri, 7 Nov 2014 22:31:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 07 Nov 2014 22:31:25 -0000 Message-Id: <061524f022164d3384424d85796d32b8@git.apache.org> In-Reply-To: <9313f972d3194f7da5001b7a5d2bc131@git.apache.org> References: <9313f972d3194f7da5001b7a5d2bc131@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] accumulo git commit: Merge branch 'ACCUMULO-3147' Merge branch 'ACCUMULO-3147' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34ca056b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34ca056b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/34ca056b Branch: refs/heads/master Commit: 34ca056b35fdfe60d782241ef72a44d04986080c Parents: 5aff1fb bc62474 Author: Christopher Tubbs Authored: Fri Nov 7 17:29:26 2014 -0500 Committer: Christopher Tubbs Committed: Fri Nov 7 17:29:26 2014 -0500 ---------------------------------------------------------------------- .../client/impl/ReplicationOperationsImpl.java | 11 +- .../accumulo/core/client/mock/MockAccumulo.java | 2 + .../core/client/mock/MockTableOperations.java | 8 +- .../replication/PrintReplicationRecords.java | 4 +- .../core/replication/ReplicaSystemHelper.java | 11 +- .../core/replication/ReplicationConstants.java | 1 - .../core/replication/ReplicationTable.java | 99 ++++++++ .../ReplicationTableOfflineException.java | 32 +++ .../ReplicationOperationsImplTest.java | 22 +- .../apache/accumulo/server/ServerConstants.java | 8 +- .../server/constraints/MetadataConstraints.java | 119 +++++----- .../apache/accumulo/server/init/Initialize.java | 174 +++++++++----- .../server/replication/ReplicationTable.java | 227 ------------------- .../server/replication/ReplicationUtil.java | 47 ++-- .../server/security/SecurityOperation.java | 3 +- .../accumulo/server/util/MetadataTableUtil.java | 24 +- .../replication/ReplicationTableTest.java | 132 ----------- .../gc/GarbageCollectWriteAheadLogs.java | 42 ++-- .../accumulo/gc/SimpleGarbageCollector.java | 7 +- .../CloseWriteAheadLogReferences.java | 16 +- .../gc/GarbageCollectWriteAheadLogsTest.java | 37 ++- .../CloseWriteAheadLogReferencesTest.java | 15 +- .../accumulo/master/FateServiceHandler.java | 3 +- .../java/org/apache/accumulo/master/Master.java | 21 +- .../master/metrics/ReplicationMetrics.java | 7 +- .../DistributedWorkQueueWorkAssigner.java | 20 +- .../master/replication/FinishedWorkUpdater.java | 15 +- .../RemoveCompleteReplicationRecords.java | 12 +- .../master/replication/StatusMaker.java | 57 ++--- .../accumulo/master/replication/WorkMaker.java | 12 +- .../accumulo/master/util/TableValidators.java | 26 ++- .../replication/FinishedWorkUpdaterTest.java | 16 +- .../RemoveCompleteReplicationRecordsTest.java | 9 +- .../replication/SequentialWorkAssignerTest.java | 16 +- .../master/replication/StatusMakerTest.java | 2 +- .../replication/UnorderedWorkAssignerTest.java | 18 +- .../master/replication/WorkMakerTest.java | 17 +- .../monitor/servlets/ReplicationServlet.java | 5 +- .../replication/ReplicationProcessor.java | 8 +- .../apache/accumulo/test/LargeSplitRowIT.java | 5 +- .../test/MasterRepairsDualAssignmentIT.java | 8 +- .../accumulo/test/MetaConstraintRetryIT.java | 7 +- .../org/apache/accumulo/test/NamespacesIT.java | 6 +- .../org/apache/accumulo/test/ShellServerIT.java | 17 +- .../apache/accumulo/test/WaitForBalanceIT.java | 14 +- .../replication/MultiInstanceReplicationIT.java | 21 +- .../test/replication/ReplicationIT.java | 210 +++++++++++------ .../test/replication/StatusCombinerMacTest.java | 20 +- .../UnorderedWorkAssignerReplicationIT.java | 14 +- 49 files changed, 800 insertions(+), 827 deletions(-) ----------------------------------------------------------------------