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 2013/01/29 21:39:49 UTC
svn commit: r1440107 -
/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
Author: ecn
Date: Tue Jan 29 20:39:49 2013
New Revision: 1440107
URL: http://svn.apache.org/viewvc?rev=1440107&view=rev
Log:
ACCUMULO-1004 fix intermittent failure of SplitRecoveryTest
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1440107&r1=1440106&r2=1440107&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Tue Jan 29 20:39:49 2013
@@ -1404,6 +1404,9 @@ public class Master implements LiveTServ
if (tls == null) {
continue;
}
+ // ignore entries for tables that do not exist in zookeeper
+ if (TableManager.getInstance().getTableState(tls.extent.getTableId().toString()) == null)
+ continue;
// Don't overwhelm the tablet servers with work
if (unassigned.size() + unloaded > MAX_TSERVER_WORK_CHUNK * currentTServers.size()) {