You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2020/07/29 10:42:23 UTC
[lucene-solr] branch master updated: SOLR-14489: remove
ReplicationHandler's deprecated "master.commitReserveDuration" use (in
favour of "commitReserveDuration")
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 2f155aa SOLR-14489: remove ReplicationHandler's deprecated "master.commitReserveDuration" use (in favour of "commitReserveDuration")
2f155aa is described below
commit 2f155aa0c3712127c54369b49ae834afb9511de4
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Wed Jul 29 10:23:17 2020 +0100
SOLR-14489: remove ReplicationHandler's deprecated "master.commitReserveDuration" use (in favour of "commitReserveDuration")
---
.../src/java/org/apache/solr/handler/ReplicationHandler.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 56b704a..b1b16b0 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -1234,7 +1234,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
public void inform(SolrCore core) {
this.core = core;
registerCloseHook();
- Long deprecatedReserveCommitDuration = null;
Object nbtk = initArgs.get(NUMBER_BACKUPS_TO_KEEP_INIT_PARAM);
if(nbtk!=null) {
numberBackupsToKeep = Integer.parseInt(nbtk.toString());
@@ -1352,11 +1351,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (s!=null) s.decref();
}
}
- String reserve = (String) master.get(RESERVE);
- if (reserve != null && !reserve.trim().equals("")) {
- reserveCommitDuration = readIntervalMs(reserve);
- deprecatedReserveCommitDuration = reserveCommitDuration;
- }
isMaster = true;
}
@@ -1364,9 +1358,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
final String reserve = (String) initArgs.get(RESERVE);
if (reserve != null && !reserve.trim().equals("")) {
reserveCommitDuration = readIntervalMs(reserve);
- if (deprecatedReserveCommitDuration != null) {
- throw new IllegalArgumentException("'master."+RESERVE+"' and '"+RESERVE+"' are mutually exclusive.");
- }
}
}
log.info("Commits will be reserved for {} ms", reserveCommitDuration);