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:52:51 UTC

lucene-solr:branch_6_4: SOLR-10138: Transaction log replay can hit an NPE due to new Metrics code.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_4 a9eb001f4 -> ed60e8499


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/ed60e849
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ed60e849
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ed60e849

Branch: refs/heads/branch_6_4
Commit: ed60e849964e0868496c045f4ce1e1b35e9c7279
Parents: a9eb001
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:52:33 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/ed60e849/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 778462e..31c9796 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -38,6 +38,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/ed60e849/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