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 2017/02/22 16:35:34 UTC

lucene-solr:branch_6x: SOLR-10160: HdfsTlogReplayBufferedWhileIndexingTest needs to be hardened.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 73e6e6f24 -> 80b4bbfdc


SOLR-10160: HdfsTlogReplayBufferedWhileIndexingTest needs to be hardened.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/80b4bbfd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/80b4bbfd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/80b4bbfd

Branch: refs/heads/branch_6x
Commit: 80b4bbfdc2c005bc001544087e66fc61c8553098
Parents: 73e6e6f
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 14:34:57 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:35:26 2017 -0500

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/util/TestInjection.java   | 8 +++++++-
 .../solr/cloud/TlogReplayBufferedWhileIndexingTest.java      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/80b4bbfd/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 0d0c023..5e4dc75 100644
--- a/solr/core/src/java/org/apache/solr/util/TestInjection.java
+++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java
@@ -283,7 +283,13 @@ public class TestInjection {
       boolean enabled = pair.first();
       int chanceIn100 = pair.second();
       if (enabled && rand.nextInt(100) >= (100 - chanceIn100)) {
-        long rndTime = rand.nextInt(1000);
+        long rndTime;
+        if (rand.nextInt(10) > 2) {
+          rndTime = rand.nextInt(300);
+        } else {
+          rndTime = rand.nextInt(1000);
+        }
+       
         log.info("inject random update delay of {}ms", rndTime);
         try {
           Thread.sleep(rndTime);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/80b4bbfd/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java
index 2fd7620..027c7fa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java
@@ -96,7 +96,7 @@ public class TlogReplayBufferedWhileIndexingTest extends AbstractFullDistribZkTe
     
     Thread.sleep(45000);
   
-    waitForThingsToLevelOut(440);
+    waitForThingsToLevelOut(600); // we can insert random update delays, so this can take a while, especially when beasting this test
     
     Thread.sleep(2000);