svn commit: r1022635 - /hadoop/zookeeper/branches/ZOOKEEPER-823/

[phunt]

Author: phunt
Date: Thu Oct 14 18:16:39 2010
New Revision: 1022635

URL: http://svn.apache.org/viewvc?rev=1022635view=rev
Log:
Branching for the Netty client patch, trying to get it onto hudson for testing

Added:
hadoop/zookeeper/branches/ZOOKEEPER-823/
  - copied from r1022634, hadoop/zookeeper/trunk/

svn commit: r1022642 [2/2] - in /hadoop/zookeeper/branches/ZOOKEEPER-823: ./ src/docs/src/documentation/content/xdocs/ src/java/main/org/apache/zookeeper/ src/java/main/org/apache/zookeeper/server/ sr

[phunt]

Added: 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/ThreadUtil.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/ThreadUtil.java?rev=1022642view=auto
==
--- 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/ThreadUtil.java
 (added)
+++ 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/ThreadUtil.java
 Thu Oct 14 18:45:47 2010
@@ -0,0 +1,70 @@
+package org.apache.zookeeper;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ThreadUtil {
+
+public static ThreadGroup getRootThreadGroup() {
+ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
+ThreadGroup parentThreadGroup;
+while ( null != (parentThreadGroup = threadGroup.getParent()) ){
+threadGroup = parentThreadGroup;  
+}
+return threadGroup;
+}
+
+public static Thread[] getAllThreads() {
+final ThreadGroup root = getRootThreadGroup();
+int arraySize = ManagementFactory.getThreadMXBean().getThreadCount();
+int returnedThreads = 0;
+Thread[] threads;
+do {
+arraySize *= 2;
+threads = new Thread[arraySize];
+returnedThreads = root.enumerate( threads, true );
+} while ( returnedThreads = arraySize );
+return java.util.Arrays.copyOf( threads, returnedThreads );
+}
+
+public static ListThread getThreadsFiltered(String pattern) {
+Thread[] allThreads = getAllThreads();
+ArrayListThread filteredThreads = new ArrayListThread();
+
+ 
+for(int i=0;iallThreads.length;++i){
+Thread currentThread = allThreads[i];
+if(currentThread.getName().contains(pattern)){
+filteredThreads.add(currentThread);
+}
+}
+return filteredThreads;
+}
+
+public static ListThread getThreadsFiltered(String pattern, Thread 
exclude){
+ListThread filteredThreads = getThreadsFiltered(pattern);
+filteredThreads.remove(exclude);
+return filteredThreads;
+}
+
+public static String formatThread(Thread thread){
+StringBuilder out = new StringBuilder();
+out.append(Name: )
+   .append(thread.getName())
+   .append( State: )
+   .append(thread.getState())
+   .append( Prio: )
+   .append(thread.getPriority())
+   .append(\nTrace:\n);
+
+StackTraceElement[] trace = thread.getStackTrace();
+
+for(int i=0;itrace.length;++i){
+out.append(trace[i]).append(\n);
+}
+   
+return out.toString();
+}
+}

Modified: 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java?rev=1022642r1=1022641r2=1022642view=diff
==
--- 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
 (original)
+++ 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
 Thu Oct 14 18:45:47 2010
@@ -181,7 +181,7 @@ public class AsyncHammerTest extends ZKT
 LOG.info(Stopping hammers);
 for (int i = 0; i  hammers.length; i++) {
 hammers[i].interrupt();
-verifyThreadTerminated(hammers[i], 6);
+verifyThreadTerminated(hammers[i], i, 6);
 Assert.assertFalse(hammers[i].failed);
 }
 
@@ -210,7 +210,7 @@ public class AsyncHammerTest extends ZKT
 bang = false;
 for (int i = 0; i  hammers.length; i++) {
 hammers[i].interrupt();
-verifyThreadTerminated(hammers[i], 6);
+verifyThreadTerminated(hammers[i], i, 6);
 }
 // before restart
 qb.verifyRootOfAllServersMatch(qb.hostPort);

Modified: 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/ClientBase.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/ClientBase.java?rev=1022642r1=1022641r2=1022642view=diff
==
--- 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/ClientBase.java
 (original)
+++ 
hadoop/zookeeper/branches/ZOOKEEPER-823/src/java/test/org/apache/zookeeper/test/ClientBase.java
 Thu Oct 14 18:45:47 2010
@@ -43,6 +43,7 @@ import org.apache.log4j.Priority;
 import 

svn commit: r1022824 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

[breed]

Author: breed
Date: Fri Oct 15 05:21:26 2010
New Revision: 1022824

URL: http://svn.apache.org/viewvc?rev=1022824view=rev
Log:
ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (jared cantwell 
via breed)


Modified:
hadoop/zookeeper/trunk/CHANGES.txt

hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=1022824r1=1022823r2=1022824view=diff
==
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Fri Oct 15 05:21:26 2010
@@ -112,6 +112,8 @@ BUGFIXES: 
 
   ZOOKEEPER-866. Hedwig Server stays in disconnected state when connection 
to ZK dies but gets reconnected (erwin tam via breed)
 
+  ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (jared cantwell 
via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java?rev=1022824r1=1022823r2=1022824view=diff
==
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
 (original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
 Fri Oct 15 05:21:26 2010
@@ -238,7 +238,6 @@ public class ZooKeeperServer implements 
  *  Restore sessions and data
  */
 public void loadData() throws IOException, InterruptedException {
-zkDb.loadDataBase();
 setZxid(zkDb.loadDataBase());
 // Clean up dead sessions
 LinkedListLong deadSessions = new LinkedListLong();