svn commit: r750751 - in /hadoop/hbase/trunk: CHANGES.txt lib/zookeeper-3.0.1.jar lib/zookeeper-3.1.0-hbase-1241.jar src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java

[jdcryans]

Author: jdcryans
Date: Fri Mar  6 02:20:55 2009
New Revision: 750751

URL: http://svn.apache.org/viewvc?rev=750751&view=rev
Log:
HBASE-1241  HBase additions to ZooKeeper part 1 (Nitay Joffe via JD)

Added:
    hadoop/hbase/trunk/lib/zookeeper-3.1.0-hbase-1241.jar   (with props)
Removed:
    hadoop/hbase/trunk/lib/zookeeper-3.0.1.jar
Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=750751&r1=750750&r2=750751&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Mar  6 02:20:55 2009
@@ -72,6 +72,7 @@
    HBASE-1188  Memory size of Java Objects - Make cacheable objects implement
                HeapSize (Erik Holstad via Stack)
    HBASE-1230  Document installation of HBase on Windows
+   HBASE-1241  HBase additions to ZooKeeper part 1 (Nitay Joffe via JD)
 
 Release 0.19.0 - 01/21/2009
   INCOMPATIBLE CHANGES

Added: hadoop/hbase/trunk/lib/zookeeper-3.1.0-hbase-1241.jar
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/lib/zookeeper-3.1.0-hbase-1241.jar?rev=750751&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/hbase/trunk/lib/zookeeper-3.1.0-hbase-1241.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: 
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java?rev=750751&r1=750750&r2=750751&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java 
(original)
+++ 
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniZooKeeperCluster.java 
Fri Mar  6 02:20:55 2009
@@ -115,8 +115,6 @@
   }
 
   private void startupStandalone() throws IOException, InterruptedException {
-    ServerStats.registerAsConcrete();
-
     File dir = new File(baseDir, "zookeeper-standalone");
     recreateDir(dir);
 
@@ -133,8 +131,6 @@
 
   // XXX: From o.a.zk.t.QuorumTest.startServers
   private void startupDistributed() throws IOException {
-    QuorumStats.registerAsConcrete();
-
     // Create map of peers
     HashMap<Long, QuorumServer> peers = new HashMap<Long, QuorumServer>();
     for (int id = 1; id <= numPeers; ++id) {
@@ -228,8 +224,6 @@
         throw new IOException("Waiting for shutdown of peer " + id);
       }
     }
-
-    ServerStats.unregister();
   }
 
   private void shutdownStandalone() throws IOException {
@@ -237,7 +231,6 @@
     if (!waitForServerDown(CLIENT_PORT_START, CONNECTION_TIMEOUT)) {
       throw new IOException("Waiting for shutdown of standalone server");
     }
-    ServerStats.unregister();
   }
 
   // XXX: From o.a.zk.t.ClientBase