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:06:11 UTC
[2/2] lucene-solr:branch_5x: SOLR-8695: Ensure ZK watchers are not
triggering our watch logic on connection events and make this handling more
consistent. Removed CDCR changes for the 5.x branches,
where CDCR was never committed: Conflicts: solr/CHANGES
SOLR-8695: Ensure ZK watchers are not triggering our watch logic on connection events and make this handling more consistent.
Removed CDCR changes for the 5.x branches, where CDCR was never committed:
Conflicts:
solr/CHANGES.txt
solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java
solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java
solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/250446a8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/250446a8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/250446a8
Branch: refs/heads/branch_5x
Commit: 250446a88184e0c0c123c620b5a3cfcd715ca820
Parents: 815562a
Author: markrmiller <ma...@apache.org>
Authored: Fri Feb 19 14:36:53 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 16:03:41 2016 -0400
----------------------------------------------------------------------
.../org/apache/solr/cloud/LeaderElector.java | 3 +--
.../apache/solr/cloud/OverseerTaskQueue.java | 10 +++++---
.../org/apache/solr/cloud/ZkController.java | 3 ++-
.../handler/admin/ZookeeperInfoHandler.java | 4 +++
.../apache/solr/common/cloud/ZkStateReader.java | 26 ++++++++------------
5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250446a8/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
index 74b3ff1..6079248 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
@@ -329,8 +329,7 @@ public class LeaderElector {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250446a8/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
index d1a85ac..05bdb13 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
@@ -130,11 +130,13 @@ public class OverseerTaskQueue extends DistributedQueue {
@Override
public void process(WatchedEvent event) {
- Event.EventType eventType = event.getType();
- // None events are ignored
+ // session events are not change events, and do not remove the watcher
+ if (Event.EventType.None.equals(event.getType())) {
+ return;
+ }
// If latchEventType is not null, only fire if the type matches
- LOG.info("{} fired on path {} state {} latchEventType {}", eventType, event.getPath(), event.getState(), latchEventType);
- if (eventType != Event.EventType.None && (latchEventType == null || eventType == latchEventType)) {
+ LOG.info("{} fired on path {} state {} latchEventType {}", event.getType(), event.getPath(), event.getState(), latchEventType);
+ if (latchEventType == null || event.getType() == latchEventType) {
synchronized (lock) {
this.event = event;
lock.notifyAll();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250446a8/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
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 cc8f7a2..0a42aff 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2432,7 +2432,8 @@ public final class ZkController {
@Override
public void process(WatchedEvent event) {
- if (event.getState() == Event.KeeperState.Disconnected || event.getState() == Event.KeeperState.Expired) {
+ // session events are not change events, and do not remove the watcher
+ if (Event.EventType.None.equals(event.getType())) {
return;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250446a8/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
index 8bc2130..e2ce63d 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
@@ -248,6 +248,10 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {
*/
@Override
public void process(WatchedEvent event) {
+ // session events are not change events, and do not remove the watcher
+ if (Event.EventType.None.equals(event.getType())) {
+ return;
+ }
synchronized (this) {
cachedCollections = null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250446a8/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
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 8fa3be9..ef75287 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
@@ -305,8 +305,7 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}
@@ -358,8 +357,7 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}
@@ -833,15 +831,14 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- if (!interestingCollections.contains(coll)) {
- // This collection is no longer interesting, stop watching.
- LOG.info("Uninteresting collection [{}]", coll);
+ // session events are not change events, and do not remove the watcher
+ if (EventType.None.equals(event.getType())) {
return;
}
- // session events are not change events,
- // and do not remove the watcher
- if (EventType.None.equals(event.getType())) {
+ if (!interestingCollections.contains(coll)) {
+ // This collection is no longer interesting, stop watching.
+ LOG.info("Uninteresting collection {}", coll);
return;
}
@@ -888,8 +885,7 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}
@@ -926,8 +922,7 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}
@@ -960,8 +955,7 @@ public class ZkStateReader implements Closeable {
@Override
public void process(WatchedEvent event) {
- // session events are not change events,
- // and do not remove the watcher
+ // session events are not change events, and do not remove the watcher
if (EventType.None.equals(event.getType())) {
return;
}