You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by no...@apache.org on 2009/06/22 14:05:55 UTC
svn commit: r787212 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/handler/ReplicationHandler.java
src/test/org/apache/solr/handler/TestReplicationHandler.java
src/webapp/web/admin/replication/index.jsp
Author: noble
Date: Mon Jun 22 12:05:54 2009
New Revision: 787212
URL: http://svn.apache.org/viewvc?rev=787212&view=rev
Log:
SOLR-1216
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/solr/trunk/src/webapp/web/admin/replication/index.jsp
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=787212&r1=787211&r2=787212&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Jun 22 12:05:54 2009
@@ -241,6 +241,8 @@
61. SOLR-1214: differentiate between solr home and instanceDir .deprecates the method SolrResourceLoader#locateInstanceDir()
and it is renamed to locateSolrHome (noble)
+62. SOLR-1216 : disambiguate the replication command names. 'snappull' becomes 'fetchindex' 'abortsnappull' becomes 'abortfetch' (noble)
+
Optimizations
----------------------
1. SOLR-374: Use IndexReader.reopen to save resources by re-using parts of the
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=787212&r1=787211&r2=787212&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java Mon Jun 22 12:05:54 2009
@@ -129,7 +129,7 @@
getFileList(solrParams, rsp);
} else if (command.equals(CMD_SNAP_SHOOT)) {
doSnapShoot(solrParams, rsp);
- } else if (command.equals(CMD_SNAP_PULL)) {
+ } else if (command.equalsIgnoreCase(CMD_FETCH_INDEX)) {
new Thread() {
public void run() {
doSnapPull(solrParams);
@@ -142,7 +142,7 @@
} else if (command.equals(CMD_ENABLE_POLL)) {
if (snapPuller != null)
snapPuller.enablePoll();
- } else if (command.equals(CMD_ABORT_SNAP_PULL)) {
+ } else if (command.equalsIgnoreCase(CMD_ABORT_FETCH)) {
if (snapPuller != null)
snapPuller.abortPull();
} else if (command.equals(CMD_FILE_CHECKSUM)) {
@@ -945,9 +945,9 @@
public static final String CMD_SNAP_SHOOT = "snapshoot";
- public static final String CMD_SNAP_PULL = "snappull";
+ public static final String CMD_FETCH_INDEX = "fetchindex";
- public static final String CMD_ABORT_SNAP_PULL = "abortsnappull";
+ public static final String CMD_ABORT_FETCH = "abortfetch";
public static final String CMD_GET_FILE_LIST = "filelist";
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=787212&r1=787211&r2=787212&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java Mon Jun 22 12:05:54 2009
@@ -321,7 +321,7 @@
assertEquals(500, masterQueryResult.getNumFound());
// snappull
- String masterUrl = "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication?command=snappull&masterUrl=";
+ String masterUrl = "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
masterUrl += "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication";
URL url = new URL(masterUrl);
InputStream stream = url.openStream();
Modified: lucene/solr/trunk/src/webapp/web/admin/replication/index.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/replication/index.jsp?rev=787212&r1=787211&r2=787212&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/replication/index.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/replication/index.jsp Mon Jun 22 12:05:54 2009
@@ -318,11 +318,11 @@
String abortParam = request.getParameter("abort");
if (replicateParam != null)
if (replicateParam.equals("now")) {
- executeCommand("snappull", solrcore, rh);
+ executeCommand("fetchindex", solrcore, rh);
}
if (abortParam != null)
if (abortParam.equals("stop")) {
- executeCommand("abortsnappull", solrcore, rh);
+ executeCommand("abortfetch", solrcore, rh);
}
%>
</td>