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 2012/01/05 17:48:24 UTC
svn commit: r1227690 -
/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Author: kturner
Date: Thu Jan 5 16:48:23 2012
New Revision: 1227690
URL: http://svn.apache.org/viewvc?rev=1227690&view=rev
Log:
ACCUMULO-169 removed TODOs that are not needed
Modified:
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1227690&r1=1227689&r2=1227690&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu Jan 5 16:48:23 2012
@@ -323,10 +323,7 @@ public class Master implements LiveTServ
private void upgradeZookeeper() {
if (Accumulo.getAccumuloPersistentVersion() == Constants.PREV_DATA_VERSION) {
- // TODO check if tablets are loaded, if so abort?
-
try {
- // TODO compare zookeeper dump of 1.3 and 1.4 zookeeper init to make sure no more zookeeper updates are needed
log.info("Upgrading zookeeper");
IZooReaderWriter zoo = ZooReaderWriter.getInstance();