svn commit: r1428138 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/Diagnostics.java test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java

[yo...@apache.org]

Author: yonik
Date: Thu Jan  3 02:04:46 2013
New Revision: 1428138

URL: http://svn.apache.org/viewvc?rev=1428138&view=rev
Log:
tests: improve stack traces

Added:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Diagnostics.java   (with props)
Modified:
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java

Added: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Diagnostics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Diagnostics.java?rev=1428138&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Diagnostics.java (added)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Diagnostics.java Thu Jan  3 02:04:46 2013
@@ -0,0 +1,42 @@
+package org.apache.solr.core;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+
+public class Diagnostics {
+  protected static Logger log = LoggerFactory.getLogger(Diagnostics.class);
+
+  public static void logThreadDumps(String message) {
+    StringBuilder sb = new StringBuilder(32768);
+    if (message == null) message = "============ THREAD DUMP REQUESTED ============";
+    sb.append(message);
+    sb.append("\n");
+    ThreadInfo[] threads = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true);
+    for (ThreadInfo info : threads) {
+      sb.append(info);
+      // sb.append("\n");
+    }
+    log.error(sb.toString());
+  }
+
+}

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java?rev=1428138&r1=1428137&r2=1428138&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java Thu Jan  3 02:04:46 2013
@@ -29,6 +29,7 @@ import org.apache.solr.common.cloud.Repl
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.core.Diagnostics;
 import org.apache.solr.servlet.SolrDispatchFilter;
 import org.apache.zookeeper.KeeperException;
 import org.junit.After;
@@ -160,17 +161,9 @@ public abstract class AbstractDistribZkT
         if (!sawLiveRecovering) {
           if (verbose) System.out.println("no one is recoverying");
         } else {
-          if (verbose) System.out
-          .println("Gave up waiting for recovery to finish..");
+          if (verbose) System.out.println("Gave up waiting for recovery to finish..");
           if (failOnTimeout) {
-            Map<Thread,StackTraceElement[]> stackTraces = Thread.getAllStackTraces();
-            for (Map.Entry<Thread,StackTraceElement[]>  entry : stackTraces.entrySet()) {
-              System.out.println("");
-              System.out.println(entry.getKey().toString());
-              for (StackTraceElement st : entry.getValue()) {
-                System.out.println(st);
-              }
-            }
+            Diagnostics.logThreadDumps("Gave up waiting for recovery to finish.  THREAD DUMP:");
             printLayout();
             fail("There are still nodes recoverying - waited for " + timeoutSeconds + " seconds");
             // won't get here