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 2020/07/16 02:05:43 UTC
[lucene-solr] branch reference_impl updated (21794eb -> f623bfe)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 21794eb @191 - Pull this test method to Nightly for now.
new 74ff13a @192 - Drop these yields.
new f623bfe @193 - Slow test to nightly.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java | 3 +--
.../core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java | 3 ---
.../core/src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 ----
solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressRecovery.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressReorder.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java | 3 ---
solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java | 1 +
9 files changed, 2 insertions(+), 24 deletions(-)
[lucene-solr] 01/02: @192 - Drop these yields.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 74ff13aee73894e870b57140fa394d2fe788e0fb
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Jul 15 21:03:42 2020 -0500
@192 - Drop these yields.
---
.../test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java | 3 +--
.../core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java | 3 ---
.../core/src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 ----
solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressRecovery.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressReorder.java | 3 ---
solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java | 3 ---
8 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
index 5f46257..8d45c6b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
@@ -110,7 +110,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
// no need to redundently factor them in here as well
DOC_ID_INCR = TestUtil.nextInt(random(), 1, 7);
- NUM_THREADS = atLeast(3);
+ NUM_THREADS = atLeast(TEST_NIGHTLY ? 3 : 2);
EXEC_SERVICE = testExecutor;
// at least 2, but don't go crazy on nightly/test.multiplier with "atLeast()"
@@ -413,7 +413,6 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
}
doRandomAtomicUpdate(docId);
}
- if (rand.nextBoolean()) { Thread.yield(); }
}
} catch (Error err) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
index 4dbd1d1..f44eeab 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -208,9 +208,6 @@ public class TestStressInPlaceUpdates extends SolrCloudBridgeTestCase {
DocInfo info = model.get(id);
- // yield after getting the next version to increase the odds of updates happening out of order
- if (rand.nextBoolean()) Thread.yield();
-
if (oper < commitPercent + deletePercent + deleteByQueryPercent) {
final boolean dbq = (oper >= commitPercent + deletePercent);
final String delType = dbq ? "DBI": "DBQ";
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 56fefe4..7b8f0b5 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -695,10 +695,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
for(int retries=0; ;retries++) {
- Thread.yield(); // might not be necessary at all
- // poll interval on slave is 1 second, so we just sleep for a few seconds
- Thread.sleep(2000);
-
NamedList<Object> slaveDetails=null;
try {
slaveDetails = getSlaveDetails();
diff --git a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java
index 4bcc004..1af97cd 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java
@@ -147,9 +147,6 @@ public class TestReloadDeadlock extends TestRTGBase {
long version = testVersion.incrementAndGet();
- // yield after getting the next version to increase the odds of updates happening out of order
- if (rand.nextBoolean()) Thread.yield();
-
if (oper < commitPercent + deleteByQueryPercent) {
deleteByQuery(id, nextVal, version);
} else {
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
index 0ebe843..181de33 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java
@@ -116,12 +116,9 @@ public class TestSolrCachePerf extends SolrTestCaseJ4 {
} else {
String value = cache.get(key);
if (value == null) {
- // increase a likelihood of context switch
- Thread.yield();
cache.put(key, VALUE);
}
}
- Thread.yield();
stopLatch.countDown();
}
} catch (InterruptedException e) {
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
index 2ed7f5c..2a83732 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
@@ -190,9 +190,6 @@ public class TestStressRecovery extends TestRTGBase {
// test may need to change depending on how we handle version numbers.
long version = testVersion.incrementAndGet();
- // yield after getting the next version to increase the odds of updates happening out of order
- if (rand.nextBoolean()) Thread.yield();
-
if (oper < commitPercent + deletePercent) {
verbose("deleting id",id,"val=",nextVal,"version",version);
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
index db3c01f..becc885 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
@@ -175,9 +175,6 @@ public class TestStressReorder extends TestRTGBase {
// test may need to change depending on how we handle version numbers.
long version = testVersion.incrementAndGet();
- // yield after getting the next version to increase the odds of updates happening out of order
- if (rand.nextBoolean()) Thread.yield();
-
if (oper < commitPercent + deletePercent) {
verbose("deleting id",id,"val=",nextVal,"version",version);
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
index a1f4930..c4b7913 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
@@ -182,9 +182,6 @@ public class TestStressUserVersions extends TestRTGBase {
// test may need to change depending on how we handle version numbers.
long version = testVersion.incrementAndGet();
- // yield after getting the next version to increase the odds of updates happening out of order
- if (rand.nextBoolean()) Thread.yield();
-
if (oper < commitPercent + deletePercent) {
verbose("deleting id",id,"val=",nextVal,"version",version);
[lucene-solr] 02/02: @193 - Slow test to nightly.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f623bfe7ffcf385e9d6c29f58804c40604cd9e98
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Jul 15 21:05:26 2020 -0500
@193 - Slow test to nightly.
---
solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index d6cf797..324866b 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -64,6 +64,7 @@ import org.slf4j.LoggerFactory;
*/
@LuceneTestCase.Slow
@SolrTestCaseJ4.SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
+@LuceneTestCase.Nightly // slow test
public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());