You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/12/16 10:18:28 UTC

[lucene-solr] branch jira/solr14089 updated: set the leader attribute in shard terms

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/solr14089
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr14089 by this push:
     new d98ef0d  set the leader attribute in shard terms
d98ef0d is described below

commit d98ef0d12fa9381a74debdf338579d7d33e6ac11
Author: noble <no...@apache.org>
AuthorDate: Mon Dec 16 21:18:11 2019 +1100

    set the leader attribute in shard terms
---
 .../org/apache/solr/cloud/ElectionContext.java     | 26 ++++++++++++++--------
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
index 1585440..ced92dc 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.solr.client.solrj.cloud.ShardTerms;
 import org.apache.solr.cloud.overseer.OverseerAction;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
@@ -240,15 +241,22 @@ class ShardLeaderElectionContextBase extends ElectionContext {
       }
     }
     if (!isAlreadyLeader) {
-      ZkNodeProps m = ZkNodeProps.fromKeyVals(Overseer.QUEUE_OPERATION, OverseerAction.LEADER.toLower(),
-          ZkStateReader.SHARD_ID_PROP, shardId,
-          ZkStateReader.COLLECTION_PROP, collection,
-          ZkStateReader.BASE_URL_PROP, leaderProps.get(ZkStateReader.BASE_URL_PROP),
-          ZkStateReader.CORE_NAME_PROP, leaderProps.get(ZkStateReader.CORE_NAME_PROP),
-          ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
-      assert zkController != null;
-      assert zkController.getOverseer() != null;
-      zkController.getOverseer().offerStateUpdate(Utils.toJSON(m));
+      for (; ; ) {
+        ShardTerms shardTerms = zkController.getShardTerms(collection, shardId).getShardTerms().setLeader(leaderProps.getStr(ZkStateReader.CORE_NODE_NAME_PROP));
+        if (zkController.getShardTerms(collection, shardId).saveTerms(shardTerms)) break;
+      }
+
+      if (!this.zkStateReader.getCollection(collection).getExternalState()) {
+        ZkNodeProps m = ZkNodeProps.fromKeyVals(Overseer.QUEUE_OPERATION, OverseerAction.LEADER.toLower(),
+            ZkStateReader.SHARD_ID_PROP, shardId,
+            ZkStateReader.COLLECTION_PROP, collection,
+            ZkStateReader.BASE_URL_PROP, leaderProps.get(ZkStateReader.BASE_URL_PROP),
+            ZkStateReader.CORE_NAME_PROP, leaderProps.get(ZkStateReader.CORE_NAME_PROP),
+            ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
+        assert zkController != null;
+        assert zkController.getOverseer() != null;
+        zkController.getOverseer().offerStateUpdate(Utils.toJSON(m));
+      }
     }
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
index 4039498..94af222 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -292,7 +292,7 @@ public class ZkShardTerms implements AutoCloseable{
    * @return true if terms is saved successfully to ZK, false if otherwise
    * @throws KeeperException.NoNodeException correspond ZK term node is not created
    */
-  private boolean saveTerms(ShardTerms newTerms) throws KeeperException.NoNodeException {
+  boolean saveTerms(ShardTerms newTerms) throws KeeperException.NoNodeException {
     byte[] znodeData = Utils.toJSON(newTerms);
     try {
       Stat stat = zkClient.setData(znodePath, znodeData, newTerms.getVersion(), true);