You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/04/04 15:19:33 UTC
lucene-solr:master: SOLR-11929: UpdateLog metrics are not initialized
on core reload
Repository: lucene-solr
Updated Branches:
refs/heads/master 2bbd19369 -> 8e276b90f
SOLR-11929: UpdateLog metrics are not initialized on core reload
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8e276b90
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8e276b90
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8e276b90
Branch: refs/heads/master
Commit: 8e276b90f520df771d8a1e60408fe112c40ceea4
Parents: 2bbd193
Author: Steve Rowe <sa...@apache.org>
Authored: Wed Apr 4 11:18:10 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Apr 4 11:19:21 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +++-
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8e276b90/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 091ce94..6a41c8d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -107,7 +107,9 @@ Bug Fixes
(Susheel Kumar, Aibao Luo, Nikkolay Martinov via Erick Erickson)
* SOLR-12172: Fixed race condition that could cause an invalid set of collection properties to be kept in
- memory when multiple collection property changes are done in a short period of time. (Tomás Fernández Löbbe)
+ memory when multiple collection property changes are done in a short period of time. (Tomás Fernández Löbbe)
+
+* SOLR-11929: UpdateLog metrics are not initialized on core reload. (ab, Steve Rowe)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8e276b90/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
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 4ca4bf2..fbdf616 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -347,13 +347,12 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
this.uhandler = uhandler;
if (dataDir.equals(lastDataDir)) {
+ versionInfo.reload();
+ core.getCoreMetricManager().registerMetricProducer(SolrInfoBean.Category.TLOG.toString(), this);
+
if (debug) {
log.debug("UpdateHandler init: tlogDir=" + tlogDir + ", next id=" + id, " this is a reopen... nothing else to do.");
}
-
- versionInfo.reload();
-
- // on a normal reopen, we currently shouldn't have to do anything
return;
}
lastDataDir = dataDir;