Skip to content

SOLR-15758: in UpdateLog allow numDeletes[ByQuery]ToKeep customisation #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cpoerschke wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

SOLR-15758: in UpdateLog allow numDeletes[ByQuery]ToKeep customisation #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba6198
SOLR-15758: in UpdateLog allow numDeletes[ByQuery]ToKeep customisation
cpoerschke Nov 2, 2021
f951748
(do not) add new UpdateLogCloudRollingRestartsTest class
cpoerschke Nov 5, 2021
4a5638e
Revert "(do not) add new UpdateLogCloudRollingRestartsTest class"
cpoerschke Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions solr/core/src/java/org/apache/solr/update/UpdateLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ public String toString() {
protected TransactionLog prevMapLog; // the transaction log used to look up entries found in prevMap
protected TransactionLog prevMapLog2; // the transaction log used to look up entries found in prevMap2

protected final int numDeletesToKeep = 1000;
protected final int numDeletesByQueryToKeep = 100;
protected int numDeletesToKeep = 1000;
protected int numDeletesByQueryToKeep = 100;
protected int numRecordsToKeep;
protected int maxNumLogsToKeep;
protected int numVersionBuckets; // This should only be used to initialize VersionInfo... the actual number of buckets may be rounded up to a power of two.
Expand Down Expand Up @@ -340,15 +340,17 @@ public void init(PluginInfo info) {
dataDir = (String)info.initArgs.get("dir");
defaultSyncLevel = SyncLevel.getSyncLevel((String)info.initArgs.get("syncLevel"));

numDeletesToKeep = objToInt(info.initArgs.get("numDeletesToKeep"), 1000);
numDeletesByQueryToKeep = objToInt(info.initArgs.get("numDeletesByQueryToKeep"), 100);
numRecordsToKeep = objToInt(info.initArgs.get("numRecordsToKeep"), 100);
maxNumLogsToKeep = objToInt(info.initArgs.get("maxNumLogsToKeep"), 10);
numVersionBuckets = objToInt(info.initArgs.get("numVersionBuckets"), 65536);
if (numVersionBuckets <= 0)
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Number of version buckets must be greater than 0!");

log.info("Initializing UpdateLog: dataDir={} defaultSyncLevel={} numRecordsToKeep={} maxNumLogsToKeep={} numVersionBuckets={}",
dataDir, defaultSyncLevel, numRecordsToKeep, maxNumLogsToKeep, numVersionBuckets);
log.info("Initializing UpdateLog: dataDir={} defaultSyncLevel={} numDeletesToKeep={} numDeletesByQueryToKeep={} numRecordsToKeep={} maxNumLogsToKeep={} numVersionBuckets={}",
dataDir, defaultSyncLevel, numDeletesToKeep, numDeletesByQueryToKeep, numRecordsToKeep, maxNumLogsToKeep, numVersionBuckets);
}

/* Note, when this is called, uhandler is not completely constructed.
Expand Down
2 changes: 2 additions & 0 deletions solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
<str name="dir">${solr.ulog.dir:}</str>
<str name="maxNumLogsToKeep">${solr.ulog.maxNumLogsToKeep:10}</str>
<str name="numRecordsToKeep">${solr.ulog.numRecordsToKeep:100}</str>
<str name="numDeletesToKeep">${solr.ulog.numDeletesToKeep:1000}</str>
<str name="numDeletesByQueryToKeep">${solr.ulog.numDeletesByQueryToKeep:100}</str>
<int name="tlogDfsReplication">${solr.ulog.tlogDfsReplication:2}</int>
</updateLog>

Expand Down
2 changes: 1 addition & 1 deletion solr/solr-ref-guide/src/commits-transaction-logs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ The number of update records to keep per log.
|Optional |Default: `10`
|===
+
The maximum number of logs keep.
The maximum number of logs to keep.

`numVersionBuckets`::
+
Expand Down