Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@<zookeeper.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1584454 - in /zookeeper/trunk: CHANGES.txt
 src/java/main/org/apache/zookeeper/ZooKeeperMain.java
 src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java
 src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java
Date: Thu, 03 Apr 2014 23:03:35 -0000
To: commits@zookeeper.apache.org
From: michim@apache.org
Message-Id: <20140403230335.7E8FC2388B6C@eris.apache.org>

Author: michim
Date: Thu Apr  3 23:03:34 2014
New Revision: 1584454

URL: http://svn.apache.org/r1584454
Log:
ZOOKEEPER-1830. Support command line shell for removing watches (Rakesh R via michim)

Added:
    zookeeper/trunk/src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java
    zookeeper/trunk/src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java
Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1584454&r1=1584453&r2=1584454&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Apr  3 23:03:34 2014
@@ -23,6 +23,9 @@ NEW FEATURES:
   ZOOKEEPER-442. need a way to remove watches that are no longer of
   interest (Rakesh R, Daniel GÃ³mez Ferro via phunt)
 
+  ZOOKEEPER-1830. Support command line shell for removing watches
+  (Rakesh R via michim)
+
 BUGFIXES:
 
   ZOOKEEPER-786. Exception in ZooKeeper.toString

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1584454&r1=1584453&r2=1584454&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Thu Apr  3 23:03:34 2014
@@ -47,6 +47,7 @@ import org.apache.zookeeper.cli.CreateCo
 import org.apache.zookeeper.cli.DelQuotaCommand;
 import org.apache.zookeeper.cli.DeleteAllCommand;
 import org.apache.zookeeper.cli.DeleteCommand;
+import org.apache.zookeeper.cli.RemoveWatchesCommand;
 import org.apache.zookeeper.cli.GetAclCommand;
 import org.apache.zookeeper.cli.GetCommand;
 import org.apache.zookeeper.cli.GetConfigCommand;
@@ -109,6 +110,7 @@ public class ZooKeeperMain {
         new AddAuthCommand().addToMap(commandMapCli);
         new ReconfigCommand().addToMap(commandMapCli);
         new GetConfigCommand().addToMap(commandMapCli);
+        new RemoveWatchesCommand().addToMap(commandMapCli);
         
         // add all to commandMap
         for (Entry<String, CliCommand> entry : commandMapCli.entrySet()) {

Added: zookeeper/trunk/src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java?rev=1584454&view=auto
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java (added)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/cli/RemoveWatchesCommand.java Thu Apr  3 23:03:34 2014
@@ -0,0 +1,84 @@
+/**
+ * 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.cli;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.Parser;
+import org.apache.commons.cli.PosixParser;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.Watcher.WatcherType;
+
+/**
+ * Remove watches command for cli
+ */
+public class RemoveWatchesCommand extends CliCommand {
+
+    private static Options options = new Options();
+    private String[] args;
+    private CommandLine cl;
+
+    {
+        options.addOption("c", false, "child watcher type");
+        options.addOption("d", false, "data watcher type");
+        options.addOption("a", false, "any watcher type");
+        options.addOption("l", false,
+                "remove locally when there is no server connection");
+    }
+
+    public RemoveWatchesCommand() {
+        super("removewatches", "path [-c|-d|-a] [-l]");
+    }
+
+    @Override
+    public CliCommand parse(String[] cmdArgs) throws ParseException {
+        Parser parser = new PosixParser();
+        cl = parser.parse(options, cmdArgs);
+        args = cl.getArgs();
+        if (args.length < 2) {
+            throw new ParseException(getUsageStr());
+        }
+        return this;
+    }
+
+    @Override
+    public boolean exec() throws KeeperException, InterruptedException {
+        String path = args[1];
+        WatcherType wtype = WatcherType.Any;
+        // if no matching option -c or -d or -a is specified, we remove
+        // the watches of the given node by choosing WatcherType.Any
+        if (cl.hasOption("c")) {
+            wtype = WatcherType.Children;
+        } else if (cl.hasOption("d")) {
+            wtype = WatcherType.Data;
+        } else if (cl.hasOption("a")) {
+            wtype = WatcherType.Any;
+        }
+        // whether to remove the watches locally
+        boolean local = cl.hasOption("l");
+
+        try {
+            zk.removeWatches(path, null, wtype, local);
+        } catch (KeeperException.NoWatcherException ex) {
+            err.println(ex.getMessage());
+            return false;
+        }
+        return true;
+    }
+}

Added: zookeeper/trunk/src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java?rev=1584454&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java (added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/RemoveWatchesCmdTest.java Thu Apr  3 23:03:34 2014
@@ -0,0 +1,345 @@
+/**
+ * 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;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.zookeeper.Watcher.Event.EventType;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.test.ClientBase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Testing remove watches using command line
+ */
+public class RemoveWatchesCmdTest extends ClientBase {
+    private static final Logger LOG = LoggerFactory
+            .getLogger(RemoveWatchesCmdTest.class);
+    private ZooKeeper zk;
+    private ZooKeeperMain zkMain;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        zk = createClient();
+        zkMain = new ZooKeeperMain(zk);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        if (zk != null) {
+            zk.close();
+        }
+        super.tearDown();
+    }
+
+    /**
+     * Test verifies default options. When there is no passed options,
+     * removewatches command will use default options - WatcherType.ANY and
+     * local=false
+     */
+    @Test(timeout = 30000)
+    public void testRemoveWatchesWithNoPassedOptions() throws Exception {
+        List<EventType> expectedEvents = new ArrayList<Watcher.Event.EventType>();
+        expectedEvents.add(EventType.ChildWatchRemoved);
+        expectedEvents.add(EventType.DataWatchRemoved);
+        MyWatcher myWatcher = new MyWatcher("/testnode1", expectedEvents, 2);
+
+        zk.create("/testnode1", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+        zk.create("/testnode2", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+
+        LOG.info("Adding childwatcher to /testnode1 and /testnode2");
+        zk.getChildren("/testnode1", myWatcher);
+        zk.getChildren("/testnode2", myWatcher);
+
+        LOG.info("Adding datawatcher to /testnode1 and /testnode2");
+        zk.getData("/testnode1", myWatcher, null);
+        zk.getData("/testnode2", myWatcher, null);
+
+        String cmdstring = "removewatches /testnode1";
+        LOG.info("Remove watchers using shell command : {}", cmdstring);
+        zkMain.cl.parseCommand(cmdstring);
+        Assert.assertTrue("Removewatches cmd fails to remove child watches",
+                zkMain.processZKCmd(zkMain.cl));
+        LOG.info("Waiting for the DataWatchRemoved event");
+        myWatcher.matches();
+
+        // verifying that other path child watches are not affected
+        Assert.assertTrue(
+                "Failed to find child watches for the path testnode2", zk
+                        .getChildWatches().contains("/testnode2"));
+        Assert.assertTrue("Failed to find data watches for the path testnode2",
+                zk.getDataWatches().contains("/testnode2"));
+    }
+
+    /**
+     * Test verifies deletion of NodeDataChanged watches
+     */
+    @Test(timeout = 30000)
+    public void testRemoveNodeDataChangedWatches() throws Exception {
+        LOG.info("Adding data watcher using getData()");
+        List<EventType> expectedEvents = new ArrayList<Watcher.Event.EventType>();
+        expectedEvents.add(EventType.DataWatchRemoved);
+        MyWatcher myWatcher = new MyWatcher("/testnode1", expectedEvents, 1);
+
+        zk.create("/testnode1", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+        zk.getData("/testnode1", myWatcher, null);
+
+        String cmdstring = "removewatches /testnode1 -d";
+        LOG.info("Remove watchers using shell command : {}", cmdstring);
+        zkMain.cl.parseCommand(cmdstring);
+        Assert.assertTrue("Removewatches cmd fails to remove data watches",
+                zkMain.processZKCmd(zkMain.cl));
+
+        LOG.info("Waiting for the DataWatchRemoved event");
+        myWatcher.matches();
+
+        // verifying that other path data watches are removed
+        Assert.assertEquals(
+                "Data watches are not removed : " + zk.getDataWatches(), 0, zk
+                        .getDataWatches().size());
+    }
+
+    /**
+     * Test verifies deletion of NodeCreated data watches
+     */
+    @Test(timeout = 30000)
+    public void testRemoveNodeCreatedWatches() throws Exception {
+        List<EventType> expectedEvents = new ArrayList<Watcher.Event.EventType>();
+        expectedEvents.add(EventType.DataWatchRemoved);
+        MyWatcher myWatcher1 = new MyWatcher("/testnode1", expectedEvents, 1);
+        MyWatcher myWatcher2 = new MyWatcher("/testnode1/testnode2",
+                expectedEvents, 1);
+        // Adding pre-created watcher
+        LOG.info("Adding NodeCreated watcher");
+        zk.exists("/testnode1", myWatcher1);
+        zk.exists("/testnode1/testnode2", myWatcher2);
+
+        String cmdstring1 = "removewatches /testnode1 -d";
+        LOG.info("Remove watchers using shell command : {}", cmdstring1);
+        zkMain.cl.parseCommand(cmdstring1);
+        Assert.assertTrue(
+                "Removewatches cmd fails to remove pre-create watches",
+                zkMain.processZKCmd(zkMain.cl));
+        myWatcher1.matches();
+        Assert.assertEquals(
+                "Failed to remove pre-create watches :" + zk.getExistWatches(),
+                1, zk.getExistWatches().size());
+        Assert.assertTrue(
+                "Failed to remove pre-create watches :" + zk.getExistWatches(),
+                zk.getExistWatches().contains("/testnode1/testnode2"));
+
+        String cmdstring2 = "removewatches /testnode1/testnode2 -d";
+        LOG.info("Remove watchers using shell command : {}", cmdstring2);
+        zkMain.cl.parseCommand(cmdstring2);
+        Assert.assertTrue("Removewatches cmd fails to remove data watches",
+                zkMain.processZKCmd(zkMain.cl));
+
+        myWatcher2.matches();
+        Assert.assertEquals(
+                "Failed to remove pre-create watches : " + zk.getExistWatches(),
+                0, zk.getExistWatches().size());
+    }
+
+    /**
+     * Test verifies deletion of NodeChildrenChanged watches
+     */
+    @Test(timeout = 30000)
+    public void testRemoveNodeChildrenChangedWatches() throws Exception {
+        List<EventType> expectedEvents = new ArrayList<Watcher.Event.EventType>();
+        expectedEvents.add(EventType.ChildWatchRemoved);
+        MyWatcher myWatcher = new MyWatcher("/testnode1", expectedEvents, 1);
+
+        zk.create("/testnode1", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+        LOG.info("Adding child changed watcher");
+        zk.getChildren("/testnode1", myWatcher);
+
+        String cmdstring = "removewatches /testnode1 -c";
+        LOG.info("Remove watchers using shell command : {}", cmdstring);
+        zkMain.cl.parseCommand(cmdstring);
+        Assert.assertTrue("Removewatches cmd fails to remove child watches",
+                zkMain.processZKCmd(zkMain.cl));
+        myWatcher.matches();
+        Assert.assertEquals(
+                "Failed to remove child watches : " + zk.getChildWatches(), 0,
+                zk.getChildWatches().size());
+    }
+
+    /**
+     * Test verifies deletion of NodeDeleted watches
+     */
+    @Test(timeout = 30000)
+    public void testRemoveNodeDeletedWatches() throws Exception {
+        LOG.info("Adding NodeDeleted watcher");
+        List<EventType> expectedEvents = new ArrayList<Watcher.Event.EventType>();
+        expectedEvents.add(EventType.ChildWatchRemoved);
+        expectedEvents.add(EventType.NodeDeleted);
+        MyWatcher myWatcher = new MyWatcher("/testnode1", expectedEvents, 1);
+
+        zk.create("/testnode1", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+        zk.create("/testnode1/testnode2", "data".getBytes(),
+                Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        zk.getChildren("/testnode1/testnode2", myWatcher);
+        zk.getChildren("/testnode1", myWatcher);
+
+        String cmdstring = "removewatches /testnode1 -c";
+        LOG.info("Remove watchers using shell command : {}", cmdstring);
+        zkMain.cl.parseCommand(cmdstring);
+        Assert.assertTrue("Removewatches cmd fails to remove child watches",
+                zkMain.processZKCmd(zkMain.cl));
+        LOG.info("Waiting for the ChildWatchRemoved event");
+        myWatcher.matches();
+        Assert.assertEquals(
+                "Failed to remove child watches : " + zk.getChildWatches(), 1,
+                zk.getChildWatches().size());
+
+        Assert.assertTrue(
+                "Failed to remove child watches :" + zk.getChildWatches(), zk
+                        .getChildWatches().contains("/testnode1/testnode2"));
+
+        // verify node delete watcher
+        zk.delete("/testnode1/testnode2", -1);
+        myWatcher.matches();
+    }
+
+    /**
+     * Test verifies deletion of any watches
+     */
+    @Test(timeout = 30000)
+    public void testRemoveAnyWatches() throws Exception {
+        verifyRemoveAnyWatches(false);
+    }
+
+    /**
+     * Test verifies deletion of watches locally when there is no server
+     * connection
+     */
+    @Test(timeout = 30000)
+    public void testRemoveWatchesLocallyWhenNoServerConnection()
+            throws Exception {
+        verifyRemoveAnyWatches(true);
+    }
+
+    private void verifyRemoveAnyWatches(boolean local) throws Exception {
+        final Map<String, List<EventType>> pathVsEvent = new HashMap<String, List<EventType>>();
+        LOG.info("Adding NodeChildrenChanged, NodeDataChanged watchers");
+        final CountDownLatch watcherLatch = new CountDownLatch(2);
+        Watcher watcher = new Watcher() {
+
+            @Override
+            public void process(WatchedEvent event) {
+                switch (event.getType()) {
+                case ChildWatchRemoved:
+                case DataWatchRemoved: {
+                    addWatchNotifications(pathVsEvent, event);
+                    watcherLatch.countDown();
+                    break;
+                }
+                case NodeChildrenChanged:
+                case NodeDataChanged: {
+                    addWatchNotifications(pathVsEvent, event);
+                    break;
+                }
+                }
+            }
+
+            private void addWatchNotifications(
+                    final Map<String, List<EventType>> pathVsEvent,
+                    WatchedEvent event) {
+                List<EventType> events = pathVsEvent.get(event.getPath());
+                if (null == events) {
+                    events = new ArrayList<Watcher.Event.EventType>();
+                    pathVsEvent.put(event.getPath(), events);
+                }
+                events.add(event.getType());
+            }
+        };
+        zk.create("/testnode1", "data".getBytes(), Ids.OPEN_ACL_UNSAFE,
+                CreateMode.PERSISTENT);
+        zk.getChildren("/testnode1", watcher);
+        zk.getData("/testnode1", watcher, null);
+        String cmdstring = "removewatches /testnode1 -a";
+        if (local) {
+            LOG.info("Stopping ZK server to verify deletion of watches locally");
+            stopServer();
+            cmdstring = "removewatches /testnode1 -a -l";
+        }
+
+        LOG.info("Remove watchers using shell command : {}", cmdstring);
+        zkMain.cl.parseCommand(cmdstring);
+        Assert.assertTrue(
+                "Removewatches cmd fails to remove child/data watches",
+                zkMain.processZKCmd(zkMain.cl));
+        LOG.info("Waiting for the WatchRemoved events");
+        watcherLatch.await(10, TimeUnit.SECONDS);
+        Assert.assertEquals("Didn't receives WatchRemoved events!", 1,
+                pathVsEvent.size());
+        Assert.assertTrue(
+                "Didn't receives DataWatchRemoved!",
+                pathVsEvent.get("/testnode1").contains(
+                        EventType.DataWatchRemoved));
+        Assert.assertTrue("Didn't receives ChildWatchRemoved!", pathVsEvent
+                .get("/testnode1").contains(EventType.ChildWatchRemoved));
+    }
+
+    private class MyWatcher implements Watcher {
+        private final String path;
+        private String eventPath;
+        private final CountDownLatch latch;
+        private final List<EventType> expectedEvents = new ArrayList<EventType>();
+
+        public MyWatcher(String path, List<EventType> expectedEvents, int count) {
+            this.path = path;
+            this.latch = new CountDownLatch(count);
+            this.expectedEvents.addAll(expectedEvents);
+        }
+
+        public void process(WatchedEvent event) {
+            LOG.debug("Event path : {}, eventPath : {}"
+                    + new Object[] { path, event.getPath() });
+            this.eventPath = event.getPath();
+            if (expectedEvents.contains(event.getType())) {
+                latch.countDown();
+            }
+        }
+
+        public boolean matches() throws InterruptedException {
+            if (!latch.await(CONNECTION_TIMEOUT / 3, TimeUnit.MILLISECONDS)) {
+                LOG.error("Failed to get watch notifications!");
+                return false;
+            }
+            LOG.debug("Client path : {} eventPath : {}", new Object[] { path,
+                    eventPath });
+            return path.equals(eventPath);
+        }
+    }
+
+}