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

SOLR-3361: fix "maxNumberOfBackups" to work if backups are triggered on commit 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1329906 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Dyer 2012-04-24 18:07:49 +00:00
parent dd8202b3ec
commit 9713155458
2 changed files with 57 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/test-files/solr/conf/solrconfig-master1-keepOneBackup.xml
View File

@ -32,7 +32,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>

122
solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
View File

@ -776,6 +776,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
if(random().nextBoolean()) {
configFile = "solrconfig-master1-keepOneBackup.xml";
addNumberToKeepInRequest = false;
backupKeepParamName = ReplicationHandler.NUMBER_BACKUPS_TO_KEEP_INIT_PARAM;
}
masterJetty.stop();
@ -791,24 +792,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
index(masterClient, "id", i, "name", "name = " + i);
masterClient.commit();
boolean checkOnCommit = random().nextBoolean();
//Check to see if 2 commits results in only one backup. (maxBackupsToKeep=1)
if(!addNumberToKeepInRequest && checkOnCommit) {
Thread.sleep(1000); //ensure the 2 backups have a separate timestamp.
masterClient.commit();
File[] files = new File(master.getDataDir()).listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
if(name.startsWith("snapshot")) {
return true;
}
return false;
}
});
assertEquals(1, files.length);
for(File f : files) {
AbstractSolrTestCase.recurseDelete(f); // clean up the snap dir
}
}
class BackupThread extends Thread {
volatile String fail = null;
@ -878,65 +861,64 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
};
};
if(!checkOnCommit) {
File[] snapDir = new File[2];
String firstBackupTimestamp = null;
for(int i=0 ; i<2 ; i++) {
BackupThread backupThread = new BackupThread(addNumberToKeepInRequest, backupKeepParamName);
backupThread.start();
File[] snapDir = new File[2];
String firstBackupTimestamp = null;
for(int i=0 ; i<2 ; i++) {
BackupThread backupThread = new BackupThread(addNumberToKeepInRequest, backupKeepParamName);
backupThread.start();
File dataDir = new File(master.getDataDir());
File dataDir = new File(master.getDataDir());
int waitCnt = 0;
CheckStatus checkStatus = new CheckStatus(firstBackupTimestamp);
while(true) {
checkStatus.run();
if(checkStatus.fail != null) {
fail(checkStatus.fail);
}
if(checkStatus.success) {
if(i==0) {
firstBackupTimestamp = checkStatus.backupTimestamp;
Thread.sleep(1000); //ensure the next backup will have a different timestamp.
}
break;
}
Thread.sleep(200);
if(waitCnt == 10) {
fail("Backup success not detected:" + checkStatus.response);
}
waitCnt++;
int waitCnt = 0;
CheckStatus checkStatus = new CheckStatus(firstBackupTimestamp);
while(true) {
checkStatus.run();
if(checkStatus.fail != null) {
fail(checkStatus.fail);
}
if(backupThread.fail != null) {
fail(backupThread.fail);
if(checkStatus.success) {
if(i==0) {
firstBackupTimestamp = checkStatus.backupTimestamp;
Thread.sleep(1000); //ensure the next backup will have a different timestamp.
}
break;
}
Thread.sleep(200);
if(waitCnt == 10) {
fail("Backup success not detected:" + checkStatus.response);
}
waitCnt++;
}
File[] files = dataDir.listFiles(new FilenameFilter() {
if(backupThread.fail != null) {
fail(backupThread.fail);
}
public boolean accept(File dir, String name) {
if(name.startsWith("snapshot")) {
return true;
}
return false;
File[] files = dataDir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
if(name.startsWith("snapshot")) {
return true;
}
});
assertEquals(1, files.length);
snapDir[i] = files[0];
Directory dir = new SimpleFSDirectory(snapDir[i].getAbsoluteFile());
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs hits = searcher.search(new MatchAllDocsQuery(), 1);
assertEquals(nDocs, hits.totalHits);
reader.close();
dir.close();
}
if(snapDir[0].exists()) {
fail("The first backup should have been cleaned up because " + backupKeepParamName + " was set to 1.");
}
for(int i=0 ; i< snapDir.length ; i++) {
AbstractSolrTestCase.recurseDelete(snapDir[i]); // clean up the snap dir
}
return false;
}
});
assertEquals(1, files.length);
snapDir[i] = files[0];
Directory dir = new SimpleFSDirectory(snapDir[i].getAbsoluteFile());
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs hits = searcher.search(new MatchAllDocsQuery(), 1);
assertEquals(nDocs, hits.totalHits);
reader.close();
dir.close();
}
if(snapDir[0].exists()) {
fail("The first backup should have been cleaned up because " + backupKeepParamName + " was set to 1.");
}
for(int i=0 ; i< snapDir.length ; i++) {
AbstractSolrTestCase.recurseDelete(snapDir[i]); // clean up the snap dir
}
}