You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/03/25 23:23:15 UTC

svn commit: r1460920 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/Master.java

Author: kturner
Date: Mon Mar 25 22:23:15 2013
New Revision: 1460920

URL: http://svn.apache.org/r1460920
Log:
ACCUMULO-1010 removed logger zookeeper entries during upgrade

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

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1460920&r1=1460919&r2=1460920&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/Master.java Mon Mar 25 22:23:15 2013
@@ -276,6 +276,9 @@ public class Master implements LiveTServ
         
         IZooReaderWriter zoo = ZooReaderWriter.getInstance();
         
+        zoo.recursiveDelete(ZooUtil.getRoot(instance) + "/loggers", NodeMissingPolicy.SKIP);
+        zoo.recursiveDelete(ZooUtil.getRoot(instance) + "/dead/loggers", NodeMissingPolicy.SKIP);
+
         zoo.putPersistentData(ZooUtil.getRoot(instance) + Constants.ZRECOVERY, new byte[] {'0'}, NodeExistsPolicy.SKIP);
         
         for (String id : Tables.getIdToNameMap(instance).keySet()) {