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 2014/04/11 23:31:51 UTC
svn commit: r1586781 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/LeaderElector.java
core/src/java/org/apache/solr/cloud/ZkController.java
test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Author: markrmiller
Date: Fri Apr 11 21:31:50 2014
New Revision: 1586781
URL: http://svn.apache.org/r1586781
Log:
SOLR-5980: AbstractFullDistribZkTestBase#compareResults always returns false for shouldFail.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1586781&r1=1586780&r2=1586781&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Apr 11 21:31:50 2014
@@ -94,7 +94,11 @@ Upgrading from Solr 4.8
Detailed Change List
----------------------
-* placeholder
+Other Changes
+---------------------
+
+* SOLR-5980: AbstractFullDistribZkTestBase#compareResults always returns false
+ for shouldFail. (Mark Miller, Gregory Chanan)
================== 4.8.0 ==================
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java?rev=1586781&r1=1586780&r2=1586781&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java Fri Apr 11 21:31:50 2014
@@ -337,6 +337,7 @@ public class LeaderElector {
}
});
}
+
void retryElection() throws KeeperException, InterruptedException, IOException {
context.cancelElection();
ElectionWatcher watcher = this.watcher;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1586781&r1=1586780&r2=1586781&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Fri Apr 11 21:31:50 2014
@@ -546,7 +546,7 @@ public final class ZkController {
adminPath = cc.getAdminPath();
overseerElector = new LeaderElector(zkClient);
- this.overseer = new Overseer(shardHandler, adminPath, zkStateReader,this);
+ this.overseer = new Overseer(shardHandler, adminPath, zkStateReader, this);
ElectionContext context = new OverseerElectionContext(zkClient, overseer, getNodeName());
overseerElector.setup(context);
overseerElector.joinElection(context, false);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1586781&r1=1586780&r2=1586781&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Fri Apr 11 21:31:50 2014
@@ -1278,7 +1278,6 @@ public abstract class AbstractFullDistri
protected boolean compareResults(long controlDocs, long cloudClientDocs, Set<String> addFails, Set<String> deleteFails)
throws SolrServerException {
- boolean shouldFail = false;
SolrParams q;
SolrDocumentList controlDocList;
SolrDocumentList cloudDocList;
@@ -1327,7 +1326,7 @@ public abstract class AbstractFullDistri
log.error("controlClient :" + a + "\n\tcloudClient :" + b);
}
- return shouldFail;
+ return true;
}
protected SolrServer getClient(String nodeName) {
@@ -1642,7 +1641,6 @@ public abstract class AbstractFullDistri
SolrServer server = createNewSolrServer("", baseUrl);
try {
res.setResponse(server.request(request));
- server.shutdown();
} finally {
if (server != null) server.shutdown();
}