accumulo-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1183033&view=rev
Log:
ACCUMULO-16: fix issues removing tserver lock in 1.3 branch

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

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1183033&r1=1183032&r2=1183033&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
(original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Thu Oct 13 19:12:13 2011
@@ -257,14 +257,18 @@ public class LiveTServerSet implements W
     }
 
     public synchronized void remove(TServerInstance server) {
-        TServerInfo remove = current.remove(server);
+        TServerInfo remove = current.remove(server.hostPort());
         if (remove != null) {
             try {
                 remove.cleanup();
-                ZooUtil.recursiveDelete(ZooUtil.getRoot(instance) + Constants.ZTSERVERS +
"/" + server.hostPort(), SKIP);
             } catch (Exception e) {
-                log.error("error removing tablet server lock", e);
+                log.info("error removing tablet server lock", e);
             }
         }
+        try {
+        	ZooUtil.recursiveDelete(ZooUtil.getRoot(instance) + Constants.ZTSERVERS + "/" +
server.hostPort(), SKIP);
+        } catch (Exception e) {
+        	log.error("error removing tablet server lock", e);
+        }
     }
 }



Mime
View raw message