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 2016/03/21 19:10:31 UTC
lucene-solr:master: SOLR-8857: HdfsUpdateLog does not use configured
or new default number of version buckets and is hard coded to 256.
Repository: lucene-solr
Updated Branches:
refs/heads/master 04bd58607 -> 93e96f688
SOLR-8857: HdfsUpdateLog does not use configured or new default number of version buckets and is hard coded to 256.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/93e96f68
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/93e96f68
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/93e96f68
Branch: refs/heads/master
Commit: 93e96f688e4066194cf42534b99d40b0a3b15f10
Parents: 04bd586
Author: markrmiller <ma...@apache.org>
Authored: Mon Mar 21 14:10:03 2016 -0400
Committer: markrmiller <ma...@apache.org>
Committed: Mon Mar 21 14:10:17 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../src/java/org/apache/solr/update/HdfsUpdateLog.java | 13 +++----------
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/93e96f68/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3c49ba9..8fc2156 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -55,6 +55,9 @@ New Features
Bug Fixes
----------------------
+* SOLR-8857: HdfsUpdateLog does not use configured or new default number of version buckets and is
+ hard coded to 256. (Mark Miller, yonik, Gregory Chanan)
+
Optimizations
----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/93e96f68/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 aa66391..bdb1d82 100644
--- a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
@@ -97,19 +97,12 @@ public class HdfsUpdateLog extends UpdateLog {
@Override
public void init(PluginInfo info) {
- dataDir = (String) info.initArgs.get("dir");
-
- defaultSyncLevel = SyncLevel.getSyncLevel((String) info.initArgs
- .get("syncLevel"));
-
- numRecordsToKeep = objToInt(info.initArgs.get("numRecordsToKeep"), 100);
- maxNumLogsToKeep = objToInt(info.initArgs.get("maxNumLogsToKeep"), 10);
+ super.init(info);
tlogDfsReplication = (Integer) info.initArgs.get( "tlogDfsReplication");
if (tlogDfsReplication == null) tlogDfsReplication = 3;
- log.info("Initializing HdfsUpdateLog: dataDir={} defaultSyncLevel={} numRecordsToKeep={} maxNumLogsToKeep={} tlogDfsReplication={}",
- dataDir, defaultSyncLevel, numRecordsToKeep, maxNumLogsToKeep, tlogDfsReplication);
+ log.info("Initializing HdfsUpdateLog: tlogDfsReplication={}", tlogDfsReplication);
}
private Configuration getConf() {
@@ -231,7 +224,7 @@ public class HdfsUpdateLog extends UpdateLog {
}
try {
- versionInfo = new VersionInfo(this, 256);
+ versionInfo = new VersionInfo(this, numVersionBuckets);
} catch (SolrException e) {
log.error("Unable to use updateLog: " + e.getMessage(), e);
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,