svn commit: r1380200 - in /lucene/dev/trunk/solr: core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java

[dw...@apache.org]

Author: dweiss
Date: Mon Sep  3 11:10:53 2012
New Revision: 1380200

URL: http://svn.apache.org/viewvc?rev=1380200&view=rev
Log:
Don't interrupt zookeeper's SyncThread because it invokes system.exit. We
should ban System.exit via the policy file. Unfortunately System.exit is
used by the runner itself too (otherwise it wouldn't be able to exit the
JVM in the presence of background threads) so the policy would need to be
selective and either ban certain packages or revoke the grant for the
runner.

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1380200&r1=1380199&r2=1380200&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Mon Sep  3 11:10:53 2012
@@ -41,7 +41,6 @@ import com.carrotsearch.randomizedtestin
  * This test simply does a bunch of basic things in solrcloud mode and asserts things
  * work as expected.
  */
-@ThreadLeakAction({Action.WARN})
 public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
 
   /*

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1380200&r1=1380199&r2=1380200&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Mon Sep  3 11:10:53 2012
@@ -78,7 +78,6 @@ import com.carrotsearch.randomizedtestin
  * work as expected.
  */
 @Slow
-@ThreadLeakAction({Action.WARN})
 public class BasicDistributedZkTest extends AbstractDistribZkTestBase {
   
   private static final String DEFAULT_COLLECTION = "collection1";

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java?rev=1380200&r1=1380199&r2=1380200&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java Mon Sep  3 11:10:53 2012
@@ -47,6 +47,12 @@ public class SolrIgnoredThreadsFilter im
         threadName.startsWith("httpShardExecutor-")) {
       return true;
     }
+    
+    // This is a bug in ZooKeeper where they call System.exit(11) when
+    // this thread receives an interrupt signal.
+    if (threadName.startsWith("SyncThread")) {
+      return true;
+    }
 
     // THESE ARE LIKELY BUGS - these threads should be closed!
     if (threadName.startsWith("Overseer-") ||