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 BE233E0F3 for ; Tue, 29 Jan 2013 20:40:11 +0000 (UTC) Received: (qmail 31248 invoked by uid 500); 29 Jan 2013 20:40:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 31216 invoked by uid 500); 29 Jan 2013 20:40:11 -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 31209 invoked by uid 99); 29 Jan 2013 20:40:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 20:40:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 20:40:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D1BF6238897F; Tue, 29 Jan 2013 20:39:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1440107 - /accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Date: Tue, 29 Jan 2013 20:39:49 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130129203949.D1BF6238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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()) {