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/08/07 18:38:28 UTC
svn commit: r1616530 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: markrmiller
Date: Thu Aug 7 16:38:28 2014
New Revision: 1616530
URL: http://svn.apache.org/r1616530
Log:
SOLR-6313: Add skip Overseer logic that did not make it in.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1616530&r1=1616529&r2=1616530&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Thu Aug 7 16:38:28 2014
@@ -558,11 +558,13 @@ public final class ZkController {
shardHandler = cc.getShardHandlerFactory().getShardHandler();
adminPath = cc.getAdminPath();
- overseerElector = new LeaderElector(zkClient);
- this.overseer = new Overseer(shardHandler, adminPath, zkStateReader, this);
- ElectionContext context = new OverseerElectionContext(zkClient, overseer, getNodeName());
- overseerElector.setup(context);
- overseerElector.joinElection(context, false);
+ if (!zkRunOnly) {
+ overseerElector = new LeaderElector(zkClient);
+ this.overseer = new Overseer(shardHandler, adminPath, zkStateReader, this);
+ ElectionContext context = new OverseerElectionContext(zkClient, overseer, getNodeName());
+ overseerElector.setup(context);
+ overseerElector.joinElection(context, false);
+ }
if (!createdWatchesAndUpdated) {
zkStateReader.createClusterStateWatchersAndUpdate();