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/02 17:15:08 UTC
[lucene-solr] branch reference_impl_dev updated (89d3489 -> f1553a6)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 89d3489 @927 Tweak.
new 50f057c @928 Shutdown tweak.
new 4fc7f0d @929 Experiment.
new f1553a6 @930 Boost.
The 3 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:
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
.../src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java | 3 +--
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 2 +-
solr/server/solr/configsets/_default/conf/solrconfig.xml | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
[lucene-solr] 01/03: @928 Shutdown tweak.
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_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 50f057c9123145011dc9259b09d21eae2de1d16a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 2 11:05:42 2020 -0500
@928 Shutdown tweak.
---
.../src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
index c4c3a6d..a39b9eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
@@ -622,7 +622,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
}
if (collectService != null) {
- scheduledFuture.cancel(true);
+ scheduledFuture.cancel(false);
collectService.shutdownNow();
}
@@ -630,7 +630,6 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
closer.collect(knownDbs.values());
closer.collect(solrClient);
closer.collect(factory);
- closer.collect(collectService);
}
knownDbs.clear();
assert ObjectReleaseTracker.release(this);
[lucene-solr] 03/03: @930 Boost.
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_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f1553a67c65b0a3e036e94be1c3c3b38553b3a81
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 2 12:05:08 2020 -0500
@930 Boost.
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 052a280..aa68686 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1620,7 +1620,7 @@ public class ZkController implements Closeable, Runnable {
// Replica.State.ACTIVE));
// there should be no stale leader state at this point, dont hit zk directly
- String leaderUrl = zkStateReader.getLeaderUrl(collection, shardId, 15000);
+ String leaderUrl = zkStateReader.getLeaderUrl(collection, shardId, 60000);
String ourUrl = ZkCoreNodeProps.getCoreUrl(baseUrl, coreName);
log.info("We are {} and leader is {}", ourUrl, leaderUrl);
[lucene-solr] 02/03: @929 Experiment.
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_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4fc7f0db200ecdccf16b3f9ae61f35f121485693
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 2 11:35:11 2020 -0500
@929 Experiment.
---
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 2 +-
solr/server/solr/configsets/_default/conf/solrconfig.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 81cf654..54cda20 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -355,7 +355,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
numRecordsToKeep = objToInt(info.initArgs.get("numRecordsToKeep"), 100);
maxNumLogsToKeep = objToInt(info.initArgs.get("maxNumLogsToKeep"), 10);
- numVersionBuckets = objToInt(info.initArgs.get("numVersionBuckets"), 32768);
+ numVersionBuckets = objToInt(info.initArgs.get("numVersionBuckets"), 16384);
if (numVersionBuckets <= 0)
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Number of version buckets must be greater than 0!");
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index e1855f8..94ad69c 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -284,7 +284,7 @@
-->
<updateLog>
<str name="dir">${solr.ulog.dir:}</str>
- <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
+ <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:16384}</int>
</updateLog>
<!-- AutoCommit