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 0267F10EE1 for ; Wed, 5 Mar 2014 21:13:28 +0000 (UTC) Received: (qmail 87139 invoked by uid 500); 5 Mar 2014 21:13:24 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87075 invoked by uid 500); 5 Mar 2014 21:13:23 -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 87064 invoked by uid 99); 5 Mar 2014 21:13:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2014 21:13:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 134F1937AB4; Wed, 5 Mar 2014 21:13:23 +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: Wed, 05 Mar 2014 21:13:23 -0000 Message-Id: <143dfc63f4534d178a1d06b86be6452a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: ACCUMULO-2412 use only pre-existing merge requests before processing the metadata table Repository: accumulo Updated Branches: refs/heads/master 4ec78981c -> 9c82498e4 ACCUMULO-2412 use only pre-existing merge requests before processing the metadata table Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8e7a8a2c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8e7a8a2c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8e7a8a2c Branch: refs/heads/master Commit: 8e7a8a2ccfd8f124f532fed747852c87f8b05cdd Parents: 9b5c53d Author: Eric Newton Authored: Wed Mar 5 15:43:23 2014 -0500 Committer: Eric Newton Committed: Wed Mar 5 15:43:23 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/master/Master.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e7a8a2c/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 70f87ae..e72fe3f 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -1288,6 +1288,11 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt int unloaded = 0; try { Map mergeStatsCache = new HashMap(); + for (MergeInfo merge : merges()) { + if (merge.getRange() != null) { + mergeStatsCache.put(merge.getRange().getTableId(), new MergeStats(merge)); + } + } // Get the current status for the current list of tservers SortedMap currentTServers = new TreeMap(); @@ -1334,7 +1339,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt Text tableId = tls.extent.getTableId(); MergeStats mergeStats = mergeStatsCache.get(tableId); if (mergeStats == null) { - mergeStatsCache.put(tableId, mergeStats = new MergeStats(getMergeInfo(tls.extent))); + mergeStatsCache.put(tableId, mergeStats = new MergeStats(new MergeInfo())); } TabletGoalState goal = getGoalState(tls, mergeStats.getMergeInfo()); TServerInstance server = tls.getServer();