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 590141094A for ; Fri, 7 Mar 2014 20:54:17 +0000 (UTC) Received: (qmail 21971 invoked by uid 500); 7 Mar 2014 20:53:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 21431 invoked by uid 500); 7 Mar 2014 20:53:21 -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 21203 invoked by uid 99); 7 Mar 2014 20:53: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 Mar 2014 20:53:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D1F5593A871; Fri, 7 Mar 2014 20:53:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 07 Mar 2014 20:53:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] git commit: ACCUMULO-2412 use only pre-existing merge requests before processing the metadata table 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/4cd12c42 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cd12c42 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cd12c42 Branch: refs/heads/ACCUMULO-2061 Commit: 4cd12c4251a7a6ac4d04b23cf7c736d81acd33de Parents: 0f23245 Author: Eric Newton Authored: Wed Mar 5 15:50:52 2014 -0500 Committer: Eric Newton Committed: Wed Mar 5 15:50:52 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/master/Master.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cd12c42/src/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/master/Master.java b/src/server/src/main/java/org/apache/accumulo/server/master/Master.java index f969f1b..aa8305b 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/src/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -1293,6 +1293,11 @@ public class Master implements LiveTServerSet.Listener, LoggerWatcher, TableObse 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();