You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/05 22:13:04 UTC
[2/3] 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/1.5.2-SNAPSHOT
Commit: 4cd12c4251a7a6ac4d04b23cf7c736d81acd33de
Parents: 0f23245
Author: Eric Newton <er...@gmail.com>
Authored: Wed Mar 5 15:50:52 2014 -0500
Committer: Eric Newton <er...@gmail.com>
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<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>();