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 2015/11/11 17:02:51 UTC
svn commit: r1713882 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/ElectionContext.java
Author: markrmiller
Date: Wed Nov 11 16:02:50 2015
New Revision: 1713882
URL: http://svn.apache.org/viewvc?rev=1713882&view=rev
Log:
SOLR-7989: Revert changes.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1713882&r1=1713881&r2=1713882&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Nov 11 16:02:50 2015
@@ -354,10 +354,8 @@ Bug Fixes
a race condition can cause that client to hang in blockUntilFinished.
(Mark Miller, yonik)
-* SOLR-8215: Only active replicas should handle incoming requests against a collection (Varun Thacker)
-* SOLR-7989: After a new leader is elected it should change it's state to ACTIVE even
- if the last published state is something else (Ishan Chattopadhyaya, Mark Miller via noble )
+* SOLR-8215: Only active replicas should handle incoming requests against a collection (Varun Thacker)
* SOLR-8223: Avoid accidentally swallowing OutOfMemoryError (in LeaderInitiatedRecoveryThread.java
or CoreContainer.java) (Mike Drob via Christine Poerschke)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1713882&r1=1713881&r2=1713882&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Wed Nov 11 16:02:50 2015
@@ -11,7 +11,6 @@ import org.apache.lucene.search.MatchAll
import org.apache.solr.cloud.overseer.OverseerAction;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -108,7 +107,6 @@ class ShardLeaderElectionContextBase ext
private static Logger log = LoggerFactory
.getLogger(ShardLeaderElectionContextBase.class);
protected final SolrZkClient zkClient;
- protected ZkStateReader zkStateReader;
protected String shardId;
protected String collection;
protected LeaderElector leaderElector;
@@ -121,7 +119,6 @@ class ShardLeaderElectionContextBase ext
+ "/leader_elect/" + shardId, ZkStateReader.getShardLeadersPath(
collection, shardId), props, zkStateReader.getZkClient());
this.leaderElector = leaderElector;
- this.zkStateReader = zkStateReader;
this.zkClient = zkStateReader.getZkClient();
this.shardId = shardId;
this.collection = collection;
@@ -216,28 +213,13 @@ class ShardLeaderElectionContextBase ext
}
assert shardId != null;
-
- ZkNodeProps m;
- ClusterState clusterState = zkStateReader.getClusterState();
- Replica rep = (clusterState == null) ? null : clusterState.getReplica(collection,
- leaderProps.getStr(ZkStateReader.CORE_NODE_NAME_PROP));
- if (rep != null && rep.getState() != Replica.State.ACTIVE) {
- m = ZkNodeProps.fromKeyVals(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
- ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString(),
- ZkStateReader.SHARD_ID_PROP, shardId,
- ZkStateReader.COLLECTION_PROP, collection,
- ZkStateReader.BASE_URL_PROP, leaderProps.getProperties().get(ZkStateReader.BASE_URL_PROP),
- ZkStateReader.NODE_NAME_PROP, leaderProps.getProperties().get(ZkStateReader.NODE_NAME_PROP),
- ZkStateReader.CORE_NODE_NAME_PROP, leaderProps.getProperties().get(ZkStateReader.CORE_NODE_NAME_PROP),
- ZkStateReader.CORE_NAME_PROP, leaderProps.getProperties().get(ZkStateReader.CORE_NAME_PROP));
- Overseer.getInQueue(zkClient).offer(Utils.toJSON(m));
- }
-
- m = ZkNodeProps.fromKeyVals(Overseer.QUEUE_OPERATION, OverseerAction.LEADER.toLower(),
- ZkStateReader.SHARD_ID_PROP, shardId,
- ZkStateReader.COLLECTION_PROP, collection,
- ZkStateReader.BASE_URL_PROP, leaderProps.getProperties().get(ZkStateReader.BASE_URL_PROP),
- ZkStateReader.CORE_NAME_PROP, leaderProps.getProperties().get(ZkStateReader.CORE_NAME_PROP));
+ ZkNodeProps m = ZkNodeProps.fromKeyVals(Overseer.QUEUE_OPERATION,
+ OverseerAction.LEADER.toLower(), ZkStateReader.SHARD_ID_PROP, shardId,
+ ZkStateReader.COLLECTION_PROP, collection, ZkStateReader.BASE_URL_PROP,
+ leaderProps.getProperties().get(ZkStateReader.BASE_URL_PROP),
+ ZkStateReader.CORE_NAME_PROP,
+ leaderProps.getProperties().get(ZkStateReader.CORE_NAME_PROP),
+ ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
Overseer.getInQueue(zkClient).offer(Utils.toJSON(m));
}