You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/04/24 20:09:46 UTC
svn commit: r1329907 - in /lucene/dev/branches/lucene_solr_3_6/solr/core/src:
test-files/solr/conf/solrconfig-master1-keepOneBackup.xml
test/org/apache/solr/handler/TestReplicationHandler.java
Author: jdyer
Date: Tue Apr 24 18:09:46 2012
New Revision: 1329907
URL: http://svn.apache.org/viewvc?rev=1329907&view=rev
Log:
SOLR-3361: fix "maxNumberOfBackups" to work if backups are triggered on commit
Modified:
lucene/dev/branches/lucene_solr_3_6/solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml
lucene/dev/branches/lucene_solr_3_6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Modified: lucene/dev/branches/lucene_solr_3_6/solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml?rev=1329907&r1=1329906&r2=1329907&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml Tue Apr 24 18:09:46 2012
@@ -40,7 +40,7 @@
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="master">
- <str name="backupAfter">commit</str>
+ <str name="replicateAfter">commit</str>
<str name="confFiles">schema-replication2.xml:schema.xml</str>
</lst>
<str name="maxNumberOfBackups">1</str>
Modified: lucene/dev/branches/lucene_solr_3_6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1329907&r1=1329906&r2=1329907&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Tue Apr 24 18:09:46 2012
@@ -626,6 +626,7 @@ public class TestReplicationHandler exte
if(random.nextBoolean()) {
configFile = "solrconfig-master1-keepOneBackup.xml";
addNumberToKeepInRequest = false;
+ backupKeepParamName = ReplicationHandler.NUMBER_BACKUPS_TO_KEEP_INIT_PARAM;
}
masterJetty.stop();
master.copyConfigFile(CONF_DIR + configFile,
@@ -712,19 +713,8 @@ public class TestReplicationHandler exte
File[] snapDir = new File[2];
String firstBackupTimestamp = null;
for(int i=0 ; i<2 ; i++) {
- BackupThread backupThread = null;
- if(!addNumberToKeepInRequest) {
- if(random.nextBoolean()) {
- masterClient.commit();
- } else {
- backupThread = new BackupThread(addNumberToKeepInRequest, backupKeepParamName);
- backupThread.start();
- }
- } else {
- backupThread = new BackupThread(addNumberToKeepInRequest, backupKeepParamName);
- backupThread.start();
- }
-
+ BackupThread backupThread = new BackupThread(addNumberToKeepInRequest, backupKeepParamName);
+ backupThread.start();
File dataDir = new File(master.getDataDir());
@@ -749,7 +739,7 @@ public class TestReplicationHandler exte
waitCnt++;
}
- if(backupThread!= null && backupThread.fail != null) {
+ if(backupThread.fail != null) {
fail(backupThread.fail);
}