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 15:51:33 UTC
lucene-solr:branch_6x: SOLR-10138: Transaction log replay can hit an
NPE due to new Metrics code.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ebe807c7d -> 94a4b3de5
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/94a4b3de
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/94a4b3de
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/94a4b3de
Branch: refs/heads/branch_6x
Commit: 94a4b3de59ccb73d7568a154c19316181c973baf
Parents: ebe807c
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:51:22 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94a4b3de/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a12ca4c..b37878a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -170,6 +170,7 @@ 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 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94a4b3de/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