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 2016/06/15 22:18:58 UTC
[2/3] lucene-solr:branch_5x: SOLR-8857: HdfsUpdateLog does not use
configured or new default number of version buckets and is hard coded to 256.
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/b5b55dfb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b5b55dfb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b5b55dfb
Branch: refs/heads/branch_5x
Commit: b5b55dfb35fdf544da8af48c3e5935b776194a4e
Parents: c92703d
Author: markrmiller <ma...@apache.org>
Authored: Mon Mar 21 14:10:03 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Jun 15 18:15:15 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/b5b55dfb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index faec8ce..a85c4fa 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -34,6 +34,9 @@ Other Changes
* SOLR-8677: Prevent shards containing invalid characters from being created. Checks added server-side
and in SolrJ. (Shai Erera, Jason Gerlowski, Anshum Gupta)
+* 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)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5b55dfb/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 b8daff8..4eac407 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 = 1;
- 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,