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 2020/11/11 00:07:04 UTC
[lucene-solr] branch reference_impl_dev updated (1af452d -> 8d62af4)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 1af452d @1149 Whoops, need stronger sync.
new 080da5d @1150 experiment.
new 8d62af4 @1151 The leader needs to be ACTIVE.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 5 +++--
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
[lucene-solr] 02/02: @1151 The leader needs to be ACTIVE.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8d62af449f2b802fe32df3f2d087e801741f1ba3
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Nov 10 18:04:28 2020 -0600
@1151 The leader needs to be ACTIVE.
---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 88c962d..2faa060 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -920,7 +920,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
Slice slice = c.getSlice(shard);
if (slice == null) return false;
Replica leader = slice.getLeader();
- if (leader != null) {
+ if (leader != null && leader.getState() == Replica.State.ACTIVE) {
returnLeader.set(leader);
return true;
}
[lucene-solr] 01/02: @1150 experiment.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 080da5d1f2e2e8349c93affbbc65a450a20b5442
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Nov 10 17:51:07 2020 -0600
@1150 experiment.
---
solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 971e505..28c82ae 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -347,9 +347,10 @@ public class ZkStateWriter {
trackVersions.remove(collection.getName());
// likely deleted
} catch (KeeperException.BadVersionException bve) {
- lastFailedException.set(bve);
- failedUpdates.put(collection.getName(), collection);
+ //lastFailedException.set(bve);
+ //failedUpdates.put(collection.getName(), collection);
stat = reader.getZkClient().exists(path, null);
+ trackVersions.put(collection.getName(), stat.getVersion());
// this is a tragic error, we must disallow usage of this instance
log.warn("Tried to update the cluster state using version={} but we where rejected, found {}", lastVersion.get(), stat.getVersion(), bve);
}