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 2012/08/02 18:33:43 UTC
svn commit: r1368590 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/update/SolrCmdDistributor.java
test-files/solr/collection1/conf/solrconfig-tlog.xml
test/org/apache/solr/update/SolrCmdDistributorTest.java
Author: markrmiller
Date: Thu Aug 2 16:33:43 2012
New Revision: 1368590
URL: http://svn.apache.org/viewvc?rev=1368590&view=rev
Log:
SOLR-3428: SolrCmdDistributor flushAdds/flushDeletes can cause repeated adds/deletes to be sent
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1368590&r1=1368589&r2=1368590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Thu Aug 2 16:33:43 2012
@@ -221,7 +221,7 @@ public class SolrCmdDistributor {
for (Node node : nodes) {
List<AddRequest> alist = adds.get(node);
- if (alist == null || alist.size() < limit) return false;
+ if (alist == null || alist.size() < limit) continue;
UpdateRequestExt ureq = new UpdateRequestExt();
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1368590&r1=1368589&r2=1368590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Thu Aug 2 16:33:43 2012
@@ -39,4 +39,6 @@
</updateLog>
</updateHandler>
+ <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
+
</config>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1368590&r1=1368589&r2=1368590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Thu Aug 2 16:33:43 2012
@@ -24,13 +24,16 @@ import java.util.List;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.request.LukeRequest;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
import org.apache.solr.update.SolrCmdDistributor.Node;
import org.apache.solr.update.SolrCmdDistributor.Response;
import org.apache.solr.update.SolrCmdDistributor.StdNode;
@@ -40,7 +43,7 @@ public class SolrCmdDistributorTest exte
public SolrCmdDistributorTest() {
fixShardCount = true;
- shardCount = 1;
+ shardCount = 4;
stress = 0;
}
@@ -80,7 +83,7 @@ public class SolrCmdDistributorTest exte
@Override
public void doTest() throws Exception {
- //del("*:*");
+ del("*:*");
SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(8);
@@ -159,6 +162,7 @@ public class SolrCmdDistributorTest exte
assertEquals(response.errors.toString(), 0, response.errors.size());
+
results = controlClient.query(new SolrQuery("*:*")).getResults();
numFound = results.getNumFound();
assertEquals(results.toString(), 2, numFound);
@@ -166,5 +170,47 @@ public class SolrCmdDistributorTest exte
numFound = client.query(new SolrQuery("*:*")).getResults()
.getNumFound();
assertEquals(results.toString(), 2, numFound);
+
+ // debug stuff
+// for (SolrServer c : clients) {
+// c.optimize();
+// System.out.println(clients.get(0).request(new LukeRequest()));
+// }
+
+ int id = 5;
+
+ cmdDistrib = new SolrCmdDistributor(8);
+
+ nodes.clear();
+ int cnt = atLeast(200);
+ for (int i = 0; i < cnt; i++) {
+ nodes.clear();
+ for (SolrServer c : clients) {
+ if (random().nextBoolean()) {
+ continue;
+ }
+ HttpSolrServer httpClient = (HttpSolrServer) c;
+ nodeProps = new ZkNodeProps(ZkStateReader.BASE_URL_PROP,
+ httpClient.getBaseURL(), ZkStateReader.CORE_NAME_PROP, "");
+ nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
+
+ }
+
+ cmd.solrDoc = sdoc("id", id++);
+ cmdDistrib.distribAdd(cmd, nodes, params);
+ }
+
+ cmdDistrib.finish();
+
+ cmdDistrib.distribCommit(ccmd, nodes, params);
+
+ for (SolrServer c : clients) {
+ NamedList<Object> resp = c.request(new LukeRequest());
+ System.out.println(resp);
+ assertEquals("SOLR-3428: We only did adds - there should be no deletes",
+ ((NamedList<Object>) resp.get("index")).get("numDocs"),
+ ((NamedList<Object>) resp.get("index")).get("maxDoc"));
+ }
+
}
}