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

SOLR-5980: AbstractFullDistribZkTestBase#compareResults always returns false for shouldFail. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1586781 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-04-11 21:31:50 +00:00
parent 34f1c1da3a
commit 856cdf8d3e
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/CHANGES.txt
View File

@ -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 ==================

1
solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
View File

@ -337,6 +337,7 @@ public class LeaderElector {
}
});
}
void retryElection() throws KeeperException, InterruptedException, IOException {
context.cancelElection();
ElectionWatcher watcher = this.watcher;

2
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -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);

4
solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
View File

@ -1278,7 +1278,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
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 AbstractFullDistribZkTestBase extends AbstractDistribZkTes
log.error("controlClient :" + a + "\n\tcloudClient :" + b);
}
return shouldFail;
return true;
}
protected SolrServer getClient(String nodeName) {
@ -1642,7 +1641,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
SolrServer server = createNewSolrServer("", baseUrl);
try {
res.setResponse(server.request(request));
server.shutdown();
} finally {
if (server != null) server.shutdown();
}