You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/11/10 06:02:51 UTC
[1/2] lucene-solr:branch_7x: SOLR-12313: Make the test finish quicker
by lower down intervals
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 8a365214b -> 2fc689fbf
SOLR-12313: Make the test finish quicker by lower down intervals
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/90e264e6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/90e264e6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/90e264e6
Branch: refs/heads/branch_7x
Commit: 90e264e647ae3e990ebd64a44642d0111b3b05b5
Parents: 8a36521
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Nov 6 11:19:13 2018 +0000
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Nov 10 06:02:33 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/ReplicateFromLeader.java | 3 +++
.../src/java/org/apache/solr/util/TestInjection.java | 12 ++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/90e264e6/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
index 5fb0946..f881b5d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
@@ -66,6 +66,9 @@ public class ReplicateFromLeader {
}
SolrConfig.UpdateHandlerInfo uinfo = core.getSolrConfig().getUpdateHandlerInfo();
String pollIntervalStr = "00:00:03";
+ if (System.getProperty("jetty.testMode") != null) {
+ pollIntervalStr = "00:00:01";
+ }
if (uinfo.autoCommmitMaxTime != -1) {
pollIntervalStr = toPollIntervalStr(uinfo.autoCommmitMaxTime/2);
} else if (uinfo.autoSoftCommmitMaxTime != -1) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/90e264e6/solr/core/src/java/org/apache/solr/util/TestInjection.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/TestInjection.java b/solr/core/src/java/org/apache/solr/util/TestInjection.java
index 588cfcb..bee6278 100644
--- a/solr/core/src/java/org/apache/solr/util/TestInjection.java
+++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java
@@ -42,6 +42,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Pair;
import org.apache.solr.common.util.SuppressForbidden;
+import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.ReplicationHandler;
@@ -439,7 +440,9 @@ public class TestInjection {
boolean enabled = pair.first();
if (!enabled) return true;
long t = System.currentTimeMillis() - 200;
- for (int i = 0; i < pair.second(); i++) {
+ int i = 0;
+ TimeOut timeOut = new TimeOut(pair.second(), TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ while (!timeOut.hasTimedOut()) {
try {
if (core.isClosed()) return true;
Replica leaderReplica = zkController.getZkStateReader().getLeaderRetry(
@@ -448,7 +451,7 @@ public class TestInjection {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.QT, ReplicationHandler.PATH);
params.set(COMMAND, CMD_DETAILS);
-
+
NamedList<Object> response = leaderClient.request(new QueryRequest(params));
long leaderVersion = (long) ((NamedList)response.get("details")).get("indexVersion");
String localVersion = core.withSearcher(searcher ->
@@ -460,9 +463,9 @@ public class TestInjection {
return true;
} else {
log.debug("Tlog replica not in sync with leader yet. Attempt: {}. Local Version={}, leader Version={}", i, localVersion, leaderVersion);
- Thread.sleep(500);
+ Thread.sleep(250);
}
-
+
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -473,6 +476,7 @@ public class TestInjection {
if (core.isClosed()) return true;
log.error("Exception when wait for replicas in sync with master. Will retry until timeout.", e);
}
+ i++;
}
return false;
}
[2/2] lucene-solr:branch_7x: SOLR-12313: No need to wait for in-sync
with leader in RecoveryAfterSoftCommitTest since we only care about recovery
Posted by da...@apache.org.
SOLR-12313: No need to wait for in-sync with leader in RecoveryAfterSoftCommitTest since we only care about recovery
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2fc689fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2fc689fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2fc689fb
Branch: refs/heads/branch_7x
Commit: 2fc689fbf9f8600baaeed385fac4bc678fd2cb18
Parents: 90e264e
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Nov 10 06:01:19 2018 +0000
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Nov 10 06:02:41 2018 +0000
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2fc689fb/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
index 8290e12..a5cc04c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
@@ -25,6 +25,7 @@ import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.util.TestInjection;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,6 +51,7 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
System.setProperty("solr.ulog.numRecordsToKeep", String.valueOf(ULOG_NUM_RECORDS_TO_KEEP));
// avoid creating too many files, see SOLR-7421
System.setProperty("useCompoundFile", "true");
+ TestInjection.waitForReplicasInSync = null;
}
@AfterClass
@@ -57,6 +59,7 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
System.clearProperty("solr.tests.maxBufferedDocs");
System.clearProperty("solr.ulog.numRecordsToKeep");
System.clearProperty("useCompoundFile");
+ TestInjection.reset();
}
/**