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/10/30 02:30:46 UTC
[lucene-solr] branch reference_impl updated: @1077 Harden test and
go back to prev per thread executor.
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
The following commit(s) were added to refs/heads/reference_impl by this push:
new 534b109 @1077 Harden test and go back to prev per thread executor.
534b109 is described below
commit 534b109602a31595ec4b10150b31509f98f67fc4
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 29 21:21:10 2020 -0500
@1077 Harden test and go back to prev per thread executor.
---
solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/SolrThread.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index eb3bdf4..c401f8c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@ -161,7 +161,7 @@ public class MoveReplicaTest extends SolrCloudTestCase {
assertEquals("should be one more core on target node!", targetNumCores + 1, getNumOfCores(cloudClient, targetNode, coll, replica.getType().name()));
// wait for recovery
- cluster.waitForActiveCollection(coll, 2, isTlog ? 4 : 2);
+ cluster.waitForActiveCollection(coll, create.getNumShards(), create.getNumShards() * (create.getNumNrtReplicas() + create.getNumPullReplicas() + create.getNumTlogReplicas()));
for (int i = 0; i < 50; i++) {
long cnt = cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound();
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrThread.java b/solr/solrj/src/java/org/apache/solr/common/SolrThread.java
index 03f1e9e..9cb22ea 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrThread.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrThread.java
@@ -13,7 +13,8 @@ public class SolrThread extends Thread {
Thread createThread = Thread.currentThread();
if (createThread instanceof SolrThread) {
- ExecutorService service = ((SolrThread) createThread).getExecutorService();
+ // nocommit - disabled for now
+ ExecutorService service = null;//((SolrThread) createThread).getExecutorService();
if (service == null) {
createExecutorService();
} else {