Return-Path: 
 <accumulo-commits-return-1042-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3B8D79332
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Thu, 16 Feb 2012 15:13:41 +0000 (UTC)
Received: (qmail 87488 invoked by uid 500); 16 Feb 2012 15:13:41 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 87456 invoked by uid 500); 16 Feb 2012 15:13:41 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 87449 invoked by uid 99); 16 Feb 2012 15:13:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 15:13:41 +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; Thu, 16 Feb 2012 15:13:38 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4A9502388900;
	Thu, 16 Feb 2012 15:13:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1245017 -
 /incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Date: Thu, 16 Feb 2012 15:13:18 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120216151318.4A9502388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecn
Date: Thu Feb 16 15:13:17 2012
New Revision: 1245017

URL: http://svn.apache.org/viewvc?rev=1245017&view=rev
Log:
ACCUMULO-393: fix in 1.3

Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1245017&r1=1245016&r2=1245017&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu Feb 16 15:13:17 2012
@@ -1399,7 +1399,8 @@ public class Master implements Listener,
   private SortedMap<TServerInstance,TabletServerStatus> gatherTableInformation() {
     long start = System.currentTimeMillis();
     SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
-    for (TServerInstance server : tserverSet.getCurrentServers()) {
+    Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
+    for (TServerInstance server : currentServers) {
       if (serversToShutdown.contains(server))
         continue;
       try {
@@ -1418,6 +1419,14 @@ public class Master implements Listener,
         }
       }
     }
+    synchronized (badServers) {
+      Set<TServerInstance> deadBadServers = new HashSet<TServerInstance>(badServers.keySet());
+      deadBadServers.removeAll(currentServers);
+      if (!badServers.isEmpty()) {
+        log.debug("Forgetting about bad servers: " + badServers);
+      }
+      badServers.entrySet().removeAll(deadBadServers);
+    }
     log.debug(String.format("Finished gathering information from %d servers in %.2f seconds", result.size(), (System.currentTimeMillis() - start) / 1000.));
     return result;
   }