Author: fpj Date: Mon Oct 18 18:26:21 2010 New Revision: 1023935 URL: http://svn.apache.org/viewvc?rev=1023935&view=rev Log: ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (Jared Cantwell via fpj)
Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1023935&r1=1023934&r2=1023935&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Mon Oct 18 18:26:21 2010 @@ -35,6 +35,9 @@ BUGFIXES: ZOOKEEPER-822. Leader election taking a long time to complete (Vishal K via phunt) + ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice + (Jared Cantwell via fpj) + IMPROVEMENTS: ZOOKEEPER-789. Improve FLE log messages (flavio via phunt) Modified: hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java?rev=1023935&r1=1023934&r2=1023935&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java (original) +++ hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Mon Oct 18 18:26:21 2010 @@ -236,7 +236,6 @@ public class ZooKeeperServer implements * Restore sessions and data */ public void loadData() throws IOException, InterruptedException { - zkDb.loadDataBase(); setZxid(zkDb.loadDataBase()); // Clean up dead sessions LinkedList<Long> deadSessions = new LinkedList<Long>();