You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/12/16 12:48:55 UTC
[lucene-solr] branch jira/solr-15052-8x updated: SOLR-15052: Fixing
based on review from jbampton
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-15052-8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-15052-8x by this push:
new 5542192 SOLR-15052: Fixing based on review from jbampton
5542192 is described below
commit 55421922ff1d843ca378fe43a63183e8c77914c4
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Wed Dec 16 18:18:35 2020 +0530
SOLR-15052: Fixing based on review from jbampton
---
.../org/apache/solr/cloud/ShardLeaderElectionContextBase.java | 2 +-
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 4 ++--
.../java/org/apache/solr/cloud/overseer/CollectionMutator.java | 8 ++++----
.../core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
index 5f74855..11141d2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
@@ -167,7 +167,7 @@ class ShardLeaderElectionContextBase extends ElectionContext {
if (zkStateReader.getClusterState() != null &&
zkStateReader.getClusterState().getCollection(collection).getSlice(shardId).getReplicas().size() < 2) {
Replica leader = zkStateReader.getLeader(collection, shardId);
- if(leader != null) currentLeader = leader.getName();
+ if (leader != null) currentLeader = leader.getName();
if (leader != null
&& leader.getNodeName().equals(leaderProps.get(ZkStateReader.NODE_NAME_PROP))
&& leader.getCoreName().equals(leaderProps.get(ZkStateReader.CORE_NAME_PROP))) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 012163d..b15fdfe 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1612,10 +1612,10 @@ public class ZkController implements Closeable {
cd.getCloudDescriptor().setLastPublished(state);
}
DocCollection coll = zkStateReader.getCollection(collection);
- if(forcePublish || sendToOverseer(coll, coreNodeName)) {
+ if (forcePublish || sendToOverseer(coll, coreNodeName)) {
overseerJobQueue.offer(Utils.toJSON(m));
} else {
-// if(log.isInfoEnabled()) {
+// if (log.isInfoEnabled()) {
//nocommit make this debug
log.info("bypassed overseer for message : {}", Utils.toJSONString(m));
// }
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
index a6b0f56..33f69bf 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
@@ -113,11 +113,11 @@ public class CollectionMutator {
boolean hasAnyOps = false;
PerReplicaStates.WriteOps replicaOps = null;
for (String prop : CollectionAdminRequest.MODIFIABLE_COLLECTION_PROPERTIES) {
- if(prop.equals(DocCollection.PER_REPLICA_STATE)) {
+ if (prop.equals(DocCollection.PER_REPLICA_STATE)) {
String val = message.getStr(DocCollection.PER_REPLICA_STATE);
- if(val == null) continue;
+ if (val == null) continue;
boolean enable = Boolean.parseBoolean(val);
- if(enable == coll.isPerReplicaState()) {
+ if (enable == coll.isPerReplicaState()) {
//already enabled
log.error("trying to set perReplicaState to {} from {}", val, coll.isPerReplicaState());
continue;
@@ -155,7 +155,7 @@ public class CollectionMutator {
}
DocCollection collection = new DocCollection(coll.getName(), coll.getSlicesMap(), m, coll.getRouter(), coll.getZNodeVersion(), coll.getZNode());
- if(replicaOps == null){
+ if (replicaOps == null){
return new ZkWriteCommand(coll.getName(), collection);
} else {
return new ZkWriteCommand(coll.getName(), collection, replicaOps, true);
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
index 77f0550..fe71739 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
@@ -80,7 +80,7 @@ public class NodeMutator {
}
if (needToUpdateCollection) {
- if(docCollection.isPerReplicaState()) {
+ if (docCollection.isPerReplicaState()) {
zkWriteCommands.add(new ZkWriteCommand(collection, docCollection.copyWithSlices(slicesCopy),
PerReplicaStates.WriteOps.downReplicas(downedReplicas, docCollection.getPerReplicaStates()), false));
} else {