You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2011/09/14 07:51:21 UTC
svn commit: r1170439 - in /zookeeper/branches/branch-3.3: CHANGES.txt
src/java/main/org/apache/zookeeper/ClientCnxn.java
src/java/main/org/apache/zookeeper/ZooKeeper.java
src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java
Author: mahadev
Date: Wed Sep 14 05:51:20 2011
New Revision: 1170439
URL: http://svn.apache.org/viewvc?rev=1170439&view=rev
Log:
ZOOKEEPER-961. Watch recovery after disconnection when connection string contains a prefix. (Matthias Spycher via mahadev)
Added:
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java
Modified:
zookeeper/branches/branch-3.3/CHANGES.txt
zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java
zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ZooKeeper.java
Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1170439&r1=1170438&r2=1170439&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Wed Sep 14 05:51:20 2011
@@ -16,7 +16,10 @@ BUGFIXES:
ZOOKEEPER-1154. Data inconsistency when the node(s) with the highest zxid is not present at the time of leader election. (Vishal Kathuria via camille)
ZOOKEEPER-1156. Log truncation truncating log too much - can cause data loss. (Vishal Kathuria via camille)
-
+
+ ZOOKEEPER-961. Watch recovery after disconnection when connection string contains a prefix.
+ (Matthias Spycher via mahadev)
+
Release 3.3.3 - 2011-02-23
Backward compatible changes:
Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1170439&r1=1170438&r2=1170439&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java Wed Sep 14 05:51:20 2011
@@ -31,6 +31,7 @@ import java.nio.channels.SocketChannel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
+import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
@@ -964,21 +965,23 @@ public class ClientCnxn {
synchronized (outgoingQueue) {
// We add backwards since we are pushing into the front
// Only send if there's a pending watch
- if (!disableAutoWatchReset &&
- (!zooKeeper.getDataWatches().isEmpty()
- || !zooKeeper.getExistWatches().isEmpty()
- || !zooKeeper.getChildWatches().isEmpty()))
- {
- SetWatches sw = new SetWatches(lastZxid,
- zooKeeper.getDataWatches(),
- zooKeeper.getExistWatches(),
- zooKeeper.getChildWatches());
- RequestHeader h = new RequestHeader();
- h.setType(ZooDefs.OpCode.setWatches);
- h.setXid(-8);
- Packet packet = new Packet(h, new ReplyHeader(), sw, null, null,
+ if (!disableAutoWatchReset) {
+ List<String> dataWatches = zooKeeper.getDataWatches();
+ List<String> existWatches = zooKeeper.getExistWatches();
+ List<String> childWatches = zooKeeper.getChildWatches();
+ if (!dataWatches.isEmpty()
+ || !existWatches.isEmpty() || !childWatches.isEmpty()) {
+ SetWatches sw = new SetWatches(lastZxid,
+ prependChroot(dataWatches),
+ prependChroot(existWatches),
+ prependChroot(childWatches));
+ RequestHeader h = new RequestHeader();
+ h.setType(ZooDefs.OpCode.setWatches);
+ h.setXid(-8);
+ Packet packet = new Packet(h, new ReplyHeader(), sw, null, null,
null);
- outgoingQueue.addFirst(packet);
+ outgoingQueue.addFirst(packet);
+ }
}
for (AuthData id : authInfo) {
@@ -999,6 +1002,23 @@ public class ClientCnxn {
}
}
+ private List<String> prependChroot(List<String> paths) {
+ if (chrootPath != null && !paths.isEmpty()) {
+ for (int i = 0; i < paths.size(); ++i) {
+ String clientPath = paths.get(i);
+ String serverPath;
+ // handle clientPath = "/"
+ if (clientPath.length() == 1) {
+ serverPath = chrootPath;
+ } else {
+ serverPath = chrootPath + clientPath;
+ }
+ paths.set(i, serverPath);
+ }
+ }
+ return paths;
+ }
+
private void sendPing() {
lastPingSentNs = System.nanoTime();
RequestHeader h = new RequestHeader(-2, OpCode.ping);
@@ -1011,7 +1031,7 @@ public class ClientCnxn {
Random r = new Random(System.nanoTime());
- private void startConnect() throws IOException {
+ private boolean startConnect() throws IOException {
if (lastConnectIndex == -1) {
// We don't want to delay the first try at a connect, so we
// start with -1 the first time around
@@ -1031,32 +1051,37 @@ public class ClientCnxn {
}
}
}
- zooKeeper.state = States.CONNECTING;
- currentConnectIndex = nextAddrToTry;
- InetSocketAddress addr = serverAddrs.get(nextAddrToTry);
- nextAddrToTry++;
- if (nextAddrToTry == serverAddrs.size()) {
- nextAddrToTry = 0;
- }
- LOG.info("Opening socket connection to server " + addr);
- SocketChannel sock;
- sock = SocketChannel.open();
- sock.configureBlocking(false);
- sock.socket().setSoLinger(false, -1);
- sock.socket().setTcpNoDelay(true);
- setName(getName().replaceAll("\\(.*\\)",
- "(" + addr.getHostName() + ":" + addr.getPort() + ")"));
- sockKey = sock.register(selector, SelectionKey.OP_CONNECT);
- if (sock.connect(addr)) {
- primeConnection(sockKey);
+ // don't re-establish connection if we are closing
+ if (!closing && zooKeeper.state.isAlive()) {
+ zooKeeper.state = States.CONNECTING;
+ currentConnectIndex = nextAddrToTry;
+ InetSocketAddress addr = serverAddrs.get(nextAddrToTry);
+ nextAddrToTry++;
+ if (nextAddrToTry == serverAddrs.size()) {
+ nextAddrToTry = 0;
+ }
+ LOG.info("Opening socket connection to server " + addr);
+ SocketChannel sock;
+ sock = SocketChannel.open();
+ sock.configureBlocking(false);
+ sock.socket().setSoLinger(false, -1);
+ sock.socket().setTcpNoDelay(true);
+ setName(getName().replaceAll("\\(.*\\)",
+ "(" + addr.getHostName() + ":" + addr.getPort() + ")"));
+ sockKey = sock.register(selector, SelectionKey.OP_CONNECT);
+ if (sock.connect(addr)) {
+ primeConnection(sockKey);
+ }
+ initialized = false;
+
+ /*
+ * Reset incomingBuffer
+ */
+ lenBuffer.clear();
+ incomingBuffer = lenBuffer;
+ return true;
}
- initialized = false;
-
- /*
- * Reset incomingBuffer
- */
- lenBuffer.clear();
- incomingBuffer = lenBuffer;
+ return false;
}
private static final String RETRY_CONN_MSG =
@@ -1070,11 +1095,10 @@ public class ClientCnxn {
while (zooKeeper.state.isAlive()) {
try {
if (sockKey == null) {
- // don't re-establish connection if we are closing
- if (closing) {
+ boolean connecting = startConnect();
+ if (!connecting) {
break;
}
- startConnect();
lastSend = now;
lastHeard = now;
}
@@ -1141,7 +1165,7 @@ public class ClientCnxn {
}
selected.clear();
} catch (Exception e) {
- if (closing) {
+ if (closing || !zooKeeper.state.isAlive()) {
if (LOG.isDebugEnabled()) {
// closing so this is expected
LOG.debug("An exception was thrown while closing send thread for session 0x"
Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ZooKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=1170439&r1=1170438&r2=1170439&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ZooKeeper.java (original)
+++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ZooKeeper.java Wed Sep 14 05:51:20 2011
@@ -114,16 +114,22 @@ public class ZooKeeper {
private final ZKWatchManager watchManager = new ZKWatchManager();
List<String> getDataWatches() {
- List<String> rc = new ArrayList<String>(watchManager.dataWatches.keySet());
- return rc;
+ synchronized(watchManager.dataWatches) {
+ List<String> rc = new ArrayList<String>(watchManager.dataWatches.keySet());
+ return rc;
+ }
}
List<String> getExistWatches() {
- List<String> rc = new ArrayList<String>(watchManager.existWatches.keySet());
- return rc;
+ synchronized(watchManager.existWatches) {
+ List<String> rc = new ArrayList<String>(watchManager.existWatches.keySet());
+ return rc;
+ }
}
List<String> getChildWatches() {
- List<String> rc = new ArrayList<String>(watchManager.childWatches.keySet());
- return rc;
+ synchronized(watchManager.childWatches) {
+ List<String> rc = new ArrayList<String>(watchManager.childWatches.keySet());
+ return rc;
+ }
}
/**
Added: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java?rev=1170439&view=auto
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java (added)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java Wed Sep 14 05:51:20 2011
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper.test;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.WatchedEvent;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.Watcher.Event.EventType;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DisconnectedWatcherTest extends ClientBase {
+ protected static final Logger LOG = Logger.getLogger(WatcherTest.class);
+ final int TIMEOUT = 5000;
+
+ private class MyWatcher extends CountdownWatcher {
+ LinkedBlockingQueue<WatchedEvent> events =
+ new LinkedBlockingQueue<WatchedEvent>();
+
+ public void process(WatchedEvent event) {
+ super.process(event);
+ if (event.getType() != Event.EventType.None) {
+ try {
+ events.put(event);
+ } catch (InterruptedException e) {
+ LOG.warn("ignoring interrupt during event.put");
+ }
+ }
+ }
+ }
+
+ // @see jira issue ZOOKEEPER-961
+
+ @Test
+ public void testChildWatcherAutoResetWithChroot() throws Exception {
+ ZooKeeper zk1 = createClient();
+
+ zk1.create("/ch1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+
+ MyWatcher watcher = new MyWatcher();
+ ZooKeeper zk2 = createClient(watcher, hostPort + "/ch1");
+ zk2.getChildren("/", true );
+
+ // this call shouldn't trigger any error or watch
+ zk1.create("/youdontmatter1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+
+ // this should trigger the watch
+ zk1.create("/ch1/youshouldmatter1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ WatchedEvent e = watcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/", e.getPath());
+
+ MyWatcher childWatcher = new MyWatcher();
+ zk2.getChildren("/", childWatcher);
+
+ stopServer();
+ watcher.waitForDisconnected(3000);
+ startServer();
+ watcher.waitForConnected(3000);
+
+ // this should trigger the watch
+ zk1.create("/ch1/youshouldmatter2", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ e = childWatcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/", e.getPath());
+ }
+
+ @Test
+ public void testDefaultWatcherAutoResetWithChroot() throws Exception {
+ ZooKeeper zk1 = createClient();
+
+ zk1.create("/ch1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+
+ MyWatcher watcher = new MyWatcher();
+ ZooKeeper zk2 = createClient(watcher, hostPort + "/ch1");
+ zk2.getChildren("/", true );
+
+ // this call shouldn't trigger any error or watch
+ zk1.create("/youdontmatter1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+
+ // this should trigger the watch
+ zk1.create("/ch1/youshouldmatter1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ WatchedEvent e = watcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/", e.getPath());
+
+ zk2.getChildren("/", true );
+
+ stopServer();
+ watcher.waitForDisconnected(3000);
+ startServer();
+ watcher.waitForConnected(3000);
+
+ // this should trigger the watch
+ zk1.create("/ch1/youshouldmatter2", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ e = watcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/", e.getPath());
+ }
+
+ @Test
+ public void testDeepChildWatcherAutoResetWithChroot() throws Exception {
+ ZooKeeper zk1 = createClient();
+
+ zk1.create("/ch1", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk1.create("/ch1/here", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk1.create("/ch1/here/we", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk1.create("/ch1/here/we/are", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+
+ MyWatcher watcher = new MyWatcher();
+ ZooKeeper zk2 = createClient(watcher, hostPort + "/ch1/here/we");
+ zk2.getChildren("/are", true );
+
+ // this should trigger the watch
+ zk1.create("/ch1/here/we/are/now", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ WatchedEvent e = watcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/are", e.getPath());
+
+ MyWatcher childWatcher = new MyWatcher();
+ zk2.getChildren("/are", childWatcher);
+
+ stopServer();
+ watcher.waitForDisconnected(3000);
+ startServer();
+ watcher.waitForConnected(3000);
+
+ // this should trigger the watch
+ zk1.create("/ch1/here/we/are/again", null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ e = childWatcher.events.poll(TIMEOUT, TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(e);
+ Assert.assertEquals(EventType.NodeChildrenChanged, e.getType());
+ Assert.assertEquals("/are", e.getPath());
+ }
+}