You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2018/12/10 18:08:54 UTC
lucene-solr:branch_7x: SOLR-12801: Fix TestSolrCloudWithKerberosAlt.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x effb9eaa7 -> 2f8ad008f
SOLR-12801: Fix TestSolrCloudWithKerberosAlt.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2f8ad008
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2f8ad008
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2f8ad008
Branch: refs/heads/branch_7x
Commit: 2f8ad008f7bb547c9b70dc9fbd04fd0df8464d35
Parents: effb9ea
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 10 11:46:27 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Mon Dec 10 12:08:47 2018 -0600
----------------------------------------------------------------------
.../core/src/test/org/apache/solr/cloud/KerberosTestServices.java | 3 +--
.../test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2f8ad008/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
index 4ec5640..cccf590 100644
--- a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
+++ b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
@@ -64,7 +64,6 @@ public class KerberosTestServices {
Locale.setDefault(Locale.US);
}
- File dir = null;
// There is time lag between selecting a port and trying to bind with it. It's possible that
// another service captures the port in between which'll result in BindException.
boolean bindException;
@@ -76,7 +75,7 @@ public class KerberosTestServices {
kdc = getKdc(workDir);
kdc.start();
} catch (BindException e) {
- FileUtils.deleteDirectory(dir); // clean directory
+ FileUtils.deleteDirectory(workDir); // clean directory
numTries++;
if (numTries == 3) {
log.error("Failed setting up MiniKDC. Tried " + numTries + " times.");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2f8ad008/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
index 9d56204..0978e57 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
@@ -21,6 +21,8 @@ import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
@@ -46,6 +48,7 @@ import org.slf4j.LoggerFactory;
})
@LuceneTestCase.Slow
+@ThreadLeakLingering(linger = 10000) // minikdc has some lingering threads
public class TestSolrCloudWithKerberosAlt extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());