You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 20:13:31 UTC
[1/2] lucene-solr:branch_5_5: SOLR-8875: Fix null clusterState from
ZkStateWriter. Revert my sanity check asserts in Overseer. (cherry picked
from commit 3bbf8aa)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 780633f6e -> 83bd4fc00
refs/heads/branch_5x 250446a88 -> 5d5719877
SOLR-8875: Fix null clusterState from ZkStateWriter. Revert my sanity check asserts in Overseer.
(cherry picked from commit 3bbf8aa)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/83bd4fc0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/83bd4fc0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/83bd4fc0
Branch: refs/heads/branch_5_5
Commit: 83bd4fc00272b5171613e44adaf523587e752f1a
Parents: 780633f
Author: David Smiley <ds...@apache.org>
Authored: Tue Apr 5 14:15:31 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 16:11:21 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 1 +
.../src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/83bd4fc0/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 09a04a0..7130105 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -43,6 +43,9 @@ Bug Fixes
* SOLR-8857: HdfsUpdateLog does not use configured or new default number of version buckets and is
hard coded to 256. (Mark Miller, yonik, Gregory Chanan)
+* SOLR-8875: SolrCloud Overseer clusterState could unexpectedly be null resulting in NPE.
+ (Scott Blum via David Smiley)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/83bd4fc0/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index b8098d6..6049548 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -151,6 +151,7 @@ public class Overseer implements Closeable {
continue; // not a no, not a yes, try ask again
}
+ //TODO consider removing 'refreshClusterState' and simply check if clusterState is null
if (refreshClusterState) {
try {
reader.updateClusterState();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/83bd4fc0/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
----------------------------------------------------------------------
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 9fb3ada..ec67ed7 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
@@ -16,6 +16,7 @@
*/
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -35,8 +36,6 @@ import org.slf4j.LoggerFactory;
import static java.util.Collections.singletonMap;
-import java.lang.invoke.MethodHandles;
-
/**
* ZkStateWriter is responsible for writing updates to the cluster state stored in ZooKeeper for
* both stateFormat=1 collection (stored in shared /clusterstate.json in ZK) and stateFormat=2 collections
@@ -84,6 +83,7 @@ public class ZkStateWriter {
this.reader = zkStateReader;
this.stats = stats;
+ this.clusterState = zkStateReader.getClusterState();
}
/**
[2/2] lucene-solr:branch_5x: SOLR-8875: Fix null clusterState from
ZkStateWriter. Revert my sanity check asserts in Overseer. (cherry picked
from commit 3bbf8aa)
Posted by sa...@apache.org.
SOLR-8875: Fix null clusterState from ZkStateWriter. Revert my sanity check asserts in Overseer.
(cherry picked from commit 3bbf8aa)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d571987
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d571987
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d571987
Branch: refs/heads/branch_5x
Commit: 5d5719877683934b7699369fa5468d56910840f4
Parents: 250446a
Author: David Smiley <ds...@apache.org>
Authored: Tue Apr 5 14:15:31 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 16:13:11 2016 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 1 +
.../src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d571987/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index b8098d6..6049548 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -151,6 +151,7 @@ public class Overseer implements Closeable {
continue; // not a no, not a yes, try ask again
}
+ //TODO consider removing 'refreshClusterState' and simply check if clusterState is null
if (refreshClusterState) {
try {
reader.updateClusterState();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d571987/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
----------------------------------------------------------------------
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 9fb3ada..ec67ed7 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
@@ -16,6 +16,7 @@
*/
package org.apache.solr.cloud.overseer;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -35,8 +36,6 @@ import org.slf4j.LoggerFactory;
import static java.util.Collections.singletonMap;
-import java.lang.invoke.MethodHandles;
-
/**
* ZkStateWriter is responsible for writing updates to the cluster state stored in ZooKeeper for
* both stateFormat=1 collection (stored in shared /clusterstate.json in ZK) and stateFormat=2 collections
@@ -84,6 +83,7 @@ public class ZkStateWriter {
this.reader = zkStateReader;
this.stats = stats;
+ this.clusterState = zkStateReader.getClusterState();
}
/**