----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/8094/ -----------------------------------------------------------
(Updated Nov. 30, 2012, 9:01 p.m.) Review request for zookeeper, Patrick Hunt, Camille Fournier, and Henry Robinson. Changes ------- This patch should address all the comments EXCEPT adding a new CommandOutputter that outputs the original unstructured text and refactoring the existing 4lw's to use Commands. I'll upload a new patch with those additions soon; I'm trying to keep these reviews somewhat manageable. There are a lot of changes here but most of them are small (comments, renaming, minor refactoring, etc.). The biggest change is how I start the AdminServer. I added AdminServer.setZooKeeperServer, and create the AdminServer before creating a ZooKeeperServer. If no server is set, commands will fail with error "This ZooKeeper instance is not currently serving requests". This duplicates the functionality of the current 4lws. An AdminServer is also started in QuorumPeerMain now, not just ZooKeeperServerMain. Description ------- See my comment in ZOOKEEPER-1346. This addresses bug ZOOKEEPER-1346. https://issues.apache.org/jira/browse/ZOOKEEPER-1346 Diffs (updated) ----- ivy.xml fadf4f4 src/java/main/org/apache/zookeeper/server/DataTree.java 0bb2317 src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java 8b4c46b src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java eec2f2a src/java/main/org/apache/zookeeper/server/ServerCnxn.java 6dd509b src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java e5c6565 src/java/main/org/apache/zookeeper/server/ServerStats.java aa0d93f src/java/main/org/apache/zookeeper/server/SessionTracker.java 3535e1b src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java 31f2785 src/java/main/org/apache/zookeeper/server/WatchManager.java 0e7c815 src/java/main/org/apache/zookeeper/server/ZKDatabase.java d6c0c05 src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java 7bb7b2f src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java 369e621 src/java/main/org/apache/zookeeper/server/ZooTrace.java ac14fe2 src/java/main/org/apache/zookeeper/server/admin/AdminServer.java PRE-CREATION src/java/main/org/apache/zookeeper/server/admin/Command.java PRE-CREATION src/java/main/org/apache/zookeeper/server/admin/CommandBase.java PRE-CREATION src/java/main/org/apache/zookeeper/server/admin/CommandOutputter.java PRE-CREATION src/java/main/org/apache/zookeeper/server/admin/Commands.java PRE-CREATION src/java/main/org/apache/zookeeper/server/admin/JsonOutputter.java PRE-CREATION src/java/main/org/apache/zookeeper/server/quorum/Leader.java 4d09b43 src/java/main/org/apache/zookeeper/server/quorum/Learner.java e8d548b src/java/main/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java 3182419 src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java 4e3a87d src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java deae926 src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java d3f1492 src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java 8665bac src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java 42207e1 Diff: https://reviews.apache.org/r/8094/diff/ Testing ------- unit tests Ran in standalone mode (only option right now) and manually tried out all the commands/links Thanks, Skye Wanderman-Milne