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/12 22:50:49 UTC
[lucene-solr] branch reference_impl updated: #99 Misc perf buff.
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 c524e7e #99 Misc perf buff.
c524e7e is described below
commit c524e7ef8590f73000eb2beed8071fae79ea0b40
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 12 17:50:32 2020 -0500
#99 Misc perf buff.
---
solr/core/src/java/org/apache/solr/core/SolrCore.java | 7 ++++---
solr/core/src/test/org/apache/solr/CursorPagingTest.java | 2 +-
.../src/test/org/apache/solr/cloud/DistributedQueueTest.java | 4 ++--
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 3 ++-
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 10 +++-------
5 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index bff9e56..4007315 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1594,7 +1594,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
ParWork.propegateInterrupt(e);
}
- List<Callable<?>> closeHookCalls = new ArrayList<>();
+ List<Callable<Object>> closeHookCalls = new ArrayList<>();
if (closeHooks != null) {
for (CloseHook hook : closeHooks) {
@@ -1607,10 +1607,11 @@ public final class SolrCore implements SolrInfoBean, Closeable {
assert ObjectReleaseTracker.release(searcherExecutor);
- closer.add("PreCloseHooks", closeHookCalls);
+ // closer.add("PreCloseHooks", closeHookCalls);
List<Callable<Object>> closeCalls = new ArrayList<Callable<Object>>();
+ closeCalls.addAll(closeHookCalls);
closeCalls.add(() -> {
IOUtils.closeQuietly(coreMetricManager);
return "SolrCoreMetricManager";
@@ -1718,7 +1719,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
});
- closeHookCalls = new ArrayList<Callable<?>>();
+ closeHookCalls = new ArrayList<Callable<Object>>();
if (closeHooks != null) {
for (CloseHook hook : closeHooks) {
diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
index 0fb2002..0437185 100644
--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
@@ -700,7 +700,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
* test faceting with deep paging
*/
public void testFacetingWithRandomSorts() throws Exception {
- final int numDocs = TestUtil.nextInt(random(), TEST_NIGHTLY ? 1000 : 100, TEST_NIGHTLY ? 3000 : 1500);
+ final int numDocs = TestUtil.nextInt(random(), TEST_NIGHTLY ? 1000 : 100, TEST_NIGHTLY ? 3000 : 500);
String[] fieldsToFacetOn = { "int", "long", "str" };
String[] facetMethods = { "enum", "fc", "fcs" };
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
index 056e715..a03ec0c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
@@ -82,7 +82,7 @@ public class DistributedQueueTest extends SolrTestCaseJ4 {
assertNull(dq.poll());
// should block until the background thread makes the offer
- (new QueueChangerThread(dq, 500)).start();
+ (new QueueChangerThread(dq, 200)).start();
assertNotNull(dq.peek(true));
assertNotNull(dq.remove());
assertNull(dq.poll());
@@ -90,7 +90,7 @@ public class DistributedQueueTest extends SolrTestCaseJ4 {
// timeout scenario ... background thread won't offer until long after the peek times out
QueueChangerThread qct = new QueueChangerThread(dq, 500);
qct.start();
- assertNull(dq.peek(400));
+ assertNull(dq.peek(100));
qct.join();
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index d98719a..af73dab 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -183,7 +183,8 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.skipCommitOnClose", "true");
System.setProperty("solr.skipReloadSPI", "true"); // can generate tons of URL garbage and can happen too often
- System.setProperty("solr.OverseerStateUpdateDelay", "1000");
+ // nocommit - not used again yet
+ System.setProperty("solr.OverseerStateUpdateDelay", "0");
System.setProperty("solr.leaderThrottle", "0");
System.setProperty("solr.recoveryThrottle", "0");
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 2c00cd9..7f214e7 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -643,6 +643,9 @@ public class ZkTestServer implements Closeable {
worker.add("zkClients", timer, chRootClient, () -> {
zkServer.shutdown();
return zkServer;
+ }, () -> {
+ zkServer.shutdown();
+ return zkServer;
});
}
@@ -652,13 +655,6 @@ public class ZkTestServer implements Closeable {
zooThread = null;
ObjectReleaseTracker.release(this);
- // TODO: this can log an exception while trying to unregister a JMX MBean
- try {
- zkServer.shutdown();
- } catch (Exception e) {
- ParWork.propegateInterrupt(e);
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Exception shutting down ZooKeeper Test Server", e);
- }
// if (cleaupDir) {
// Files.walk(getZkDir())