accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [25/50] [abbrv] git commit: ACCUMULO-2412 use only pre-existing merge requests before processing the metadata table
Date Fri, 07 Mar 2014 20:53:39 GMT
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/ACCUMULO-2061
Commit: 8e7a8a2ccfd8f124f532fed747852c87f8b05cdd
Parents: 9b5c53d
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Mar 5 15:43:23 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
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<Text,MergeStats> mergeStatsCache = new HashMap<Text,MergeStats>();
+          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<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<TServerInstance,TabletServerStatus>();
@@ -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();


Mime
View raw message