incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1183050 - /incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Date Thu, 13 Oct 2011 19:35:41 GMT
Author: ecn
Date: Thu Oct 13 19:35:41 2011
New Revision: 1183050

URL: http://svn.apache.org/viewvc?rev=1183050&view=rev
Log:
ACCUMULO-37: fix logic bug that caused the master to shutdown a tablet server on the first
communication problem

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=1183050&r1=1183049&r2=1183050&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 Oct 13 19:35:41 2011
@@ -1461,13 +1461,14 @@ public class Master implements Listener,
                 result.put(server, status);
             } catch (Exception ex) {
                 log.error("unable to get tablet server status " + server);
-                if (badServers.get(server).incrementAndGet() > MAX_BAD_STATUS_COUNT)
+                if (badServers.get(server).incrementAndGet() > MAX_BAD_STATUS_COUNT) {
                     try {
                         tserverSet.getConnection(server).halt(masterLock);
                     } catch (Exception e) {
                         log.info("error talking to troublesome tablet server ", e);
                     }
-                tserverSet.remove(server);
+                    tserverSet.remove(server);
+                }
             }
         }
         log.debug(String.format("Finished gathering information from %d servers in %.2f seconds",
result.size(),



Mime
View raw message