You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/10 22:10:00 UTC
[6/6] lucene-solr:jira/solr-10233: Reset TestInjector after modifying
it in tests
Reset TestInjector after modifying it in tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/71e1149d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/71e1149d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/71e1149d
Branch: refs/heads/jira/solr-10233
Commit: 71e1149d40bbc700aef34d98907142ef38e8dbb8
Parents: 1c53272
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Wed May 10 15:09:45 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Wed May 10 15:09:45 2017 -0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/util/TestInjection.java | 6 ++++--
.../ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java | 1 +
.../cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java | 1 +
.../src/test/org/apache/solr/cloud/TestAppendReplica.java | 7 ++++++-
.../src/test/org/apache/solr/cloud/TestPassiveReplica.java | 6 ++++++
.../apache/solr/cloud/TestPassiveReplicaErrorHandling.java | 1 +
6 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/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 6b7b1f8..f3eb484 100644
--- a/solr/core/src/java/org/apache/solr/util/TestInjection.java
+++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java
@@ -75,7 +75,7 @@ public class TestInjection {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Pattern ENABLED_PERCENT = Pattern.compile("(true|false)(?:\\:(\\d+))?$", Pattern.CASE_INSENSITIVE);
-
+
private static final String LUCENE_TEST_CASE_FQN = "org.apache.lucene.util.LuceneTestCase";
/**
@@ -151,6 +151,7 @@ public class TestInjection {
splitFailureBeforeReplicaCreation = null;
prepRecoveryOpPauseForever = null;
countPrepRecoveryOpPauseForever = new AtomicInteger(0);
+ waitForReplicasInSync = "true:60";
for (Timer timer : timers) {
timer.cancel();
@@ -387,9 +388,10 @@ public class TestInjection {
String localVersion = searcher.get().getIndexReader().getIndexCommit().getUserData().get(SolrIndexWriter.COMMIT_TIME_MSEC_KEY);
if (localVersion == null && leaderVersion == 0 && !core.getUpdateHandler().getUpdateLog().hasUncommittedChanges()) return true;
if (localVersion != null && Long.parseLong(localVersion) == leaderVersion && (leaderVersion >= t || i >= 6)) {
- log.info("Waiting time for replica in sync with leader: {}", System.currentTimeMillis()-currentTime);
+ log.info("Waiting time for append replica to be in sync with leader: {}", System.currentTimeMillis()-currentTime);
return true;
} else {
+ log.debug("Append replica not in sync with leader yet. Attempt: {}", i);
Thread.sleep(500);
}
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
index ce35529..94d6e45 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
@@ -78,6 +78,7 @@ public class ChaosMonkeyNothingIsSafeWithPassiveReplicasTest extends AbstractFul
public static void afterSuperClass() {
System.clearProperty("solr.autoCommit.maxTime");
clearErrorHook();
+ TestInjection.reset();
}
protected static final String[] fieldNames = new String[]{"f_i", "f_f", "f_d", "f_l", "f_dt"};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java
index 556a61b..8639fba 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPassiveReplicasTest.java
@@ -73,6 +73,7 @@ public class ChaosMonkeySafeLeaderWithPassiveReplicasTest extends AbstractFullDi
public static void afterSuperClass() {
System.clearProperty("solr.autoCommit.maxTime");
clearErrorHook();
+ TestInjection.reset();
}
protected static final String[] fieldNames = new String[]{"f_i", "f_f", "f_d", "f_l", "f_dt"};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
index 23dde01..a0cc1f5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
@@ -61,8 +61,8 @@ import org.apache.solr.util.RefCounted;
import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,6 +93,11 @@ public class TestAppendReplica extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
}
+ @AfterClass
+ public static void tearDownCluster() {
+ TestInjection.reset();
+ }
+
@Override
public void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
index 70f2627..c9cacbb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
@@ -51,6 +51,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.slf4j.Logger;
@@ -83,6 +84,11 @@ public class TestPassiveReplica extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
}
+ @AfterClass
+ public static void tearDownCluster() {
+ TestInjection.reset();
+ }
+
@Override
public void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/71e1149d/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplicaErrorHandling.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplicaErrorHandling.java
index 7dd147a..f331ef6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplicaErrorHandling.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplicaErrorHandling.java
@@ -108,6 +108,7 @@ public class TestPassiveReplicaErrorHandling extends SolrCloudTestCase {
}
proxies = null;
jettys = null;
+ TestInjection.reset();
}
@Override