You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/04/24 14:13:19 UTC
lucene-solr:master: SOLR-10489 Tentative fix for a test failure
(Mikhail Khludnev via ab)
Repository: lucene-solr
Updated Branches:
refs/heads/master 487e08526 -> c09d82e53
SOLR-10489 Tentative fix for a test failure (Mikhail Khludnev via ab)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c09d82e5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c09d82e5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c09d82e5
Branch: refs/heads/master
Commit: c09d82e5381a6b328c108c9b755986ddeb801c38
Parents: 487e085
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Apr 24 16:12:02 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Apr 24 16:12:02 2017 +0200
----------------------------------------------------------------------
.../apache/solr/handler/admin/StatsReloadRaceTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c09d82e5/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java b/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
index c455b69..9fee818 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/StatsReloadRaceTest.java
@@ -67,13 +67,14 @@ public class StatsReloadRaceTest extends SolrTestCaseJ4 {
boolean isCompleted;
do {
if (random.nextBoolean()) {
- requestMetrics();
+ requestMetrics(true);
} else {
requestCoreStatus();
}
isCompleted = checkReloadComlpetion(asyncId);
} while (!isCompleted);
+ requestMetrics(false);
}
}
@@ -105,7 +106,7 @@ public class StatsReloadRaceTest extends SolrTestCaseJ4 {
return isCompleted;
}
- private void requestMetrics() throws Exception {
+ private void requestMetrics(boolean softFail) throws Exception {
SolrQueryResponse rsp = new SolrQueryResponse();
String registry = "solr.core." + h.coreName;
String key = "SEARCHER.searcher.indexVersion";
@@ -126,9 +127,12 @@ public class StatsReloadRaceTest extends SolrTestCaseJ4 {
assertTrue(metrics.get(key) instanceof Long);
break;
} else {
- Thread.sleep(1000);
+ Thread.sleep(500);
}
}
+ if (softFail && !found) {
+ return;
+ }
assertTrue("Key " + key + " not found in registry " + registry, found);
}