You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/15 19:00:54 UTC
[50/52] [abbrv] lucene-solr:jira/solr-9858: SOLR-10138: Transaction
log replay can hit an NPE due to new Metrics code.
SOLR-10138: Transaction log replay can hit an NPE due to new Metrics code.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f51253a3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f51253a3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f51253a3
Branch: refs/heads/jira/solr-9858
Commit: f51253a331fb938fd92eab4dab60df380d6837b8
Parents: 9275c2f
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Feb 15 16:28:36 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Feb 15 16:49:18 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f51253a3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 518c52c..9fcc20c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -231,6 +231,8 @@ Bug Fixes
Default settings in solrconfig.xml /config/indexConfig/metrics have been changed to turn off
IndexWriter and Directory level metrics collection. (ab, ishan)
+* SOLR-10138: Transaction log replay can hit an NPE due to new Metrics code. (ab)
+
================== 6.4.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f51253a3/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
index 764b099..71e20d9 100644
--- a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
@@ -37,6 +37,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.util.HdfsUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +122,7 @@ public class HdfsUpdateLog extends UpdateLog {
String ulogDir = core.getCoreDescriptor().getUlogDir();
this.uhandler = uhandler;
-
+
synchronized (fsLock) {
// just like dataDir, we do not allow
// moving the tlog dir on reload
@@ -259,7 +260,9 @@ public class HdfsUpdateLog extends UpdateLog {
}
}
-
+
+ // initialize metrics
+ core.getCoreMetricManager().registerMetricProducer(SolrInfoMBean.Category.TLOG.toString(), this);
}
@Override