You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/01/08 03:01:54 UTC
svn commit: r1430111 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/SnapShooter.java
core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
Author: markrmiller
Date: Tue Jan 8 02:01:54 2013
New Revision: 1430111
URL: http://svn.apache.org/viewvc?rev=1430111&view=rev
Log:
SOLR-4170: The 'backup' ReplicationHandler command can sometimes use a stale index directory rather than the current one.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1430111&r1=1430110&r2=1430111&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jan 8 02:01:54 2013
@@ -490,6 +490,9 @@ Bug Fixes
* SOLR-4279: Wrong exception message if _version_ field is multivalued (shalin)
+* SOLR-4170: The 'backup' ReplicationHandler command can sometimes use a stale
+ index directory rather than the current one. (Mark Miller, Marcin Rzewuck)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java?rev=1430111&r1=1430110&r2=1430111&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java Tue Jan 8 02:01:54 2013
@@ -80,7 +80,7 @@ public class SnapShooter {
}
void createSnapshot(final IndexCommit indexCommit, int numberToKeep, ReplicationHandler replicationHandler) {
-
+ LOG.info("Creating backup snapshot...");
NamedList<Object> details = new NamedList<Object>();
details.add("startTime", new Date().toString());
File snapShotDir = null;
@@ -102,7 +102,7 @@ public class SnapShooter {
Collection<String> files = indexCommit.getFileNames();
FileCopier fileCopier = new FileCopier();
- Directory dir = solrCore.getDirectoryFactory().get(solrCore.getIndexDir(), solrCore.getSolrConfig().indexConfig.lockType);
+ Directory dir = solrCore.getDirectoryFactory().get(solrCore.getNewIndexDir(), solrCore.getSolrConfig().indexConfig.lockType);
try {
fileCopier.copyFiles(dir, files, snapShotDir);
} finally {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1430111&r1=1430110&r2=1430111&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Tue Jan 8 02:01:54 2013
@@ -17,13 +17,24 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.io.IOUtils;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
@@ -32,7 +43,11 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.servlet.SolrDispatchFilter;
+import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.BeforeClass;
/**
@@ -332,6 +347,103 @@ public class BasicDistributedZk2Test ext
waitForRecoveriesToFinish(false);
checkShardConsistency(true, false);
+
+ // try a backup command
+ final HttpSolrServer client = (HttpSolrServer) shardToJetty.get(SHARD2).get(0).client.solrClient;
+ System.out.println("base url: "+ client.getBaseURL());
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.set("qt", "/replication");
+ params.set("command", "backup");
+
+ QueryRequest request = new QueryRequest(params);
+ NamedList<Object> results = client.request(request );
+ System.out.println("results:" + results);
+
+
+ checkForBackupSuccess(client);
+
+ }
+ private void checkForBackupSuccess(final HttpSolrServer client)
+ throws InterruptedException, IOException {
+ class CheckStatus extends Thread {
+ volatile String fail = null;
+ volatile String response = null;
+ volatile boolean success = false;
+ final Pattern p = Pattern
+ .compile("<str name=\"snapshotCompletedAt\">(.*?)</str>");
+
+ CheckStatus() {}
+
+ @Override
+ public void run() {
+ String masterUrl = client.getBaseURL() + "/replication?command="
+ + ReplicationHandler.CMD_DETAILS;
+ URL url;
+ InputStream stream = null;
+ try {
+ url = new URL(masterUrl);
+ stream = url.openStream();
+ response = IOUtils.toString(stream, "UTF-8");
+ if (response.contains("<str name=\"status\">success</str>")) {
+ Matcher m = p.matcher(response);
+ if (!m.find()) {
+ fail("could not find the completed timestamp in response.");
+ }
+
+ success = true;
+ }
+ stream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail = e.getMessage();
+ } finally {
+ IOUtils.closeQuietly(stream);
+ }
+
+ };
+ }
+ ;
+ SolrCore core = ((SolrDispatchFilter) shardToJetty.get(SHARD2).get(0).jetty
+ .getDispatchFilter().getFilter()).getCores().getCore("collection1");
+ String ddir;
+ try {
+ ddir = core.getDataDir();
+ } finally {
+ core.close();
+ }
+ File dataDir = new File(ddir);
+
+ int waitCnt = 0;
+ CheckStatus checkStatus = new CheckStatus();
+ while (true) {
+ checkStatus.run();
+ if (checkStatus.fail != null) {
+ fail(checkStatus.fail);
+ }
+ if (checkStatus.success) {
+ break;
+ }
+ Thread.sleep(200);
+ if (waitCnt == 20) {
+ fail("Backup success not detected:" + checkStatus.response);
+ }
+ waitCnt++;
+ }
+
+ File[] files = dataDir.listFiles(new FilenameFilter() {
+
+ @Override
+ public boolean accept(File dir, String name) {
+ if (name.startsWith("snapshot")) {
+ return true;
+ }
+ return false;
+ }
+ });
+ assertEquals(Arrays.asList(files).toString(), 1, files.length);
+ File snapDir = files[0];
+
+ AbstractSolrTestCase.recurseDelete(snapDir); // clean up the snap dir
}
private void addNewReplica() throws Exception {