accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1180256 - in /incubator/accumulo: branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Date Fri, 07 Oct 2011 21:49:33 GMT
Author: kturner
Date: Fri Oct  7 21:49:32 2011
New Revision: 1180256

URL: http://svn.apache.org/viewvc?rev=1180256&view=rev
Log:
ACCUMULO-16 Use correct path when deleting tserver lock in zookeeper

Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    incubator/accumulo/trunk/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=1180256&r1=1180255&r2=1180256&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
Fri Oct  7 21:49:32 2011
@@ -261,7 +261,7 @@ public class LiveTServerSet implements W
         if (remove != null) {
             try {
                 remove.cleanup();
-                ZooUtil.recursiveDelete(ZooUtil.getRoot(instance) + Constants.ZTSERVERS +
"/" + server, SKIP);
+                ZooUtil.recursiveDelete(ZooUtil.getRoot(instance) + Constants.ZTSERVERS +
"/" + server.hostPort(), SKIP);
             } catch (Exception e) {
                 log.error("error removing tablet server lock", e);
             }

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1180256&r1=1180255&r2=1180256&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Fri Oct  7 21:49:32 2011
@@ -282,7 +282,7 @@ public class LiveTServerSet implements W
             }
         }
         log.info("Removing zookeeper lock for " + server);
-        String zpath = ZooUtil.getRoot(instance) + Constants.ZTSERVERS + "/" + server;
+        String zpath = ZooUtil.getRoot(instance) + Constants.ZTSERVERS + "/" + server.hostPort();
         try {
             ZooReaderWriter.getInstance().recursiveDelete(zpath, SKIP);
         } catch (Exception e) {



Mime
View raw message