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/26 14:32:31 UTC
[lucene-solr] branch reference_impl updated (918cfaf -> 076cab5)
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.
discard 918cfaf @339 Some test improvements.
new 42768fc @338 Some test improvements.
new 076cab5 @339 Whoop, remove this hook.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (918cfaf)
\
N -- N -- N refs/heads/reference_impl (076cab5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.../core/src/java/org/apache/solr/cloud/ZkController.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
[lucene-solr] 02/02: @339 Whoop, remove this hook.
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 076cab58cb1ad1906fe5ca8add5ab10d34bbc899
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 09:28:36 2020 -0500
@339 Whoop, remove this hook.
---
.../core/src/java/org/apache/solr/cloud/ZkController.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 7d996f2..2d7b3e0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -948,13 +948,14 @@ public class ZkController implements Closeable {
}
private void init() {
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- shutdown();
- ParWork.close(ParWork.getExecutor());
- }
-
- });
+ // nocommit
+// Runtime.getRuntime().addShutdownHook(new Thread() {
+// public void run() {
+// shutdown();
+// ParWork.close(ParWork.getExecutor());
+// }
+//
+// });
synchronized (initLock) {
log.info("making shutdown watcher for cluster");
try {
[lucene-solr] 01/02: @338 Some test improvements.
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 42768fc9f93687f079d1e51485b7f150e4fa05c7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Jul 25 23:14:36 2020 -0500
@338 Some test improvements.
---
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 5 +--
.../solr/common/cloud/TestZkConfigManager.java | 4 +--
.../org/apache/solr/SolrIgnoredThreadsFilter.java | 6 ++--
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
.../java/org/apache/solr/cloud/ZkTestServer.java | 42 ++++++----------------
5 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
index d7a2b28..55bd9dd 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
@@ -229,10 +229,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
@AfterClass
private static void afterClass() throws Exception {
- if (null != CLOUD_CLIENT) {
- CLOUD_CLIENT.close();
- CLOUD_CLIENT = null;
- }
+ CLOUD_CLIENT = null;
for (Http2SolrClient client : CLIENTS) {
client.close();
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
index 55eadd8..caa2786 100644
--- a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
@@ -66,7 +66,7 @@ public class TestZkConfigManager extends SolrTestCaseJ4 {
@Test
public void testUploadConfig() throws IOException, KeeperException {
- zkServer.ensurePathExists("/solr");
+ zkServer.getZkClient().mkdir("/solr");
try (SolrZkClient zkClient = new SolrZkClient(zkServer.getZkAddress("/solr"), 10000).start()) {
@@ -132,7 +132,7 @@ public class TestZkConfigManager extends SolrTestCaseJ4 {
@Test
public void testUploadWithACL() throws IOException, KeeperException {
- zkServer.ensurePathExists("/acl");
+ zkServer.getZkClient().mkdir("/acl");
final String readOnlyUsername = "readonly";
final String readOnlyPassword = "readonly";
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
index 5016796..39730ec 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -43,9 +43,9 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter {
}
// due to netty - will stop on it's own
- if (threadName.startsWith("globalEventExecutor")) {
- return true;
- }
+// if (threadName.startsWith("globalEventExecutor")) {
+// return true;
+// }
// These is a java pool for the collection stream api
if (threadName.startsWith("ForkJoinPool.")) {
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 cb79305..f578ffc 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -265,7 +265,7 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.tests.ramPerThreadHardLimitMB", "30");
- System.setProperty("solr.http2solrclient.default.idletimeout", "10000");
+ System.setProperty("solr.http2solrclient.default.idletimeout", "1500");
System.setProperty("distribUpdateSoTimeout", "10000");
System.setProperty("socketTimeout", "15000");
System.setProperty("connTimeout", "10000");
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 2393c58..ad73f78 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
@@ -118,8 +118,8 @@ public class ZkTestServer implements Closeable {
private volatile int theTickTime = TICK_TIME;
// SOLR-12101 - provide defaults to avoid max timeout 20 enforced by our server instance when tick time is 1000
- private volatile int maxSessionTimeout = 90000;
- private volatile int minSessionTimeout = 3000;
+ private volatile int maxSessionTimeout = 45000;
+ private volatile int minSessionTimeout = 1000;
protected volatile SolrZkClient chRootClient;
@@ -160,9 +160,9 @@ public class ZkTestServer implements Closeable {
private volatile long limit;
private volatile LimitViolationAction action;
@SuppressWarnings("unchecked")
- private AtomicLongMap<String> counters = AtomicLongMap.create(new ConcurrentHashMap<>(128, 0.75f, 2048));
+ private AtomicLongMap<String> counters = AtomicLongMap.create(new ConcurrentHashMap<>(128, 0.75f, 64));
@SuppressWarnings("unchecked")
- private Map<String,Long> maxCounters = new ConcurrentHashMap<>(128, 0.75f, 2048);
+ private Map<String,Long> maxCounters = new ConcurrentHashMap<>(128, 0.75f, 64);
WatchLimit(long limit, String desc, LimitViolationAction action) {
this.limit = limit;
@@ -394,21 +394,18 @@ public class ZkTestServer implements Closeable {
*/
protected void shutdown() throws IOException {
try {
- ZKDatabase zkDb = zooKeeperServer.getZKDatabase();
-
+// zooKeeperServer.shutdown(true);
+ // ZKDatabase zkDb = zooKeeperServer.getZKDatabase();
+ // if (zkDb != null) zkDb.clear();
try (ParWork worker = new ParWork(this, true)) {
worker.add("ZkTestInternals", () -> {
cnxnFactory.shutdown();
- return cnxnFactory;
- },
- () -> {
- zkDb.clear();
- return zkDb;
- },
- () -> {
cnxnFactory.join();
return cnxnFactory;
- });
+ }, ()->{
+ zooKeeperServer.shutdown(true);
+ return zooKeeperServer;
+ });
}
} finally {
ObjectReleaseTracker.release(this);
@@ -495,23 +492,6 @@ public class ZkTestServer implements Closeable {
return getZkHost() + chroot;
}
- /**
- * Check that a path exists in this server
- *
- * @param path
- * the path to check
- * @throws IOException
- * if an IO exception occurs
- */
- public void ensurePathExists(String path) throws IOException {
- try {
- chRootClient.makePath(path, null, CreateMode.PERSISTENT, null, false, true, 0);
- } catch (InterruptedException | KeeperException e) {
- ParWork.propegateInterrupt(e);
- throw new IOException("Error checking path " + path, SolrZkClient.checkInterrupted(e));
- }
- }
-
public int getPort() {
return zkServer.getLocalPort();
}