Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14489: remove ReplicationHandler's deprecated "master.commitReserveDuration" use (in favour of "commitReserveDuration")

This commit is contained in:
Christine Poerschke 2020-07-29 10:23:17 +01:00
parent ebb5219b1b
commit 2f155aa0c3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
View File

@ -1234,7 +1234,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
public void inform(SolrCore core) { public void inform(SolrCore core) {
this.core = core; this.core = core;
registerCloseHook(); registerCloseHook();
Long deprecatedReserveCommitDuration = null;
Object nbtk = initArgs.get(NUMBER_BACKUPS_TO_KEEP_INIT_PARAM); Object nbtk = initArgs.get(NUMBER_BACKUPS_TO_KEEP_INIT_PARAM);
if(nbtk!=null) { if(nbtk!=null) {
numberBackupsToKeep = Integer.parseInt(nbtk.toString()); numberBackupsToKeep = Integer.parseInt(nbtk.toString());
@ -1352,11 +1351,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (s!=null) s.decref(); if (s!=null) s.decref();
} }
} }
String reserve = (String) master.get(RESERVE);
if (reserve != null && !reserve.trim().equals("")) {
reserveCommitDuration = readIntervalMs(reserve);
deprecatedReserveCommitDuration = reserveCommitDuration;
}
isMaster = true; isMaster = true;
} }
@ -1364,9 +1358,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
final String reserve = (String) initArgs.get(RESERVE); final String reserve = (String) initArgs.get(RESERVE);
if (reserve != null && !reserve.trim().equals("")) { if (reserve != null && !reserve.trim().equals("")) {
reserveCommitDuration = readIntervalMs(reserve); 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); log.info("Commits will be reserved for {} ms", reserveCommitDuration);