Skip to content

ZOOKEEPER-5105: zkCli addWatch reuses the mode of a previous invocation when -m is omitted #2478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CCCLL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ZOOKEEPER-5105: zkCli addWatch reuses the mode of a previous invocation when -m is omitted #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public CliCommand parse(String[] cmdArgs) throws CliParseException {
} catch (IllegalArgumentException e) {
throw new CliParseException(getUsageStr());
}
} else {
mode = defaultMode;
}

return this;
Expand Down
15 changes: 15 additions & 0 deletions zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,21 @@ public void testSetAclRecursive() throws Exception {
assertEquals(Ids.OPEN_ACL_UNSAFE, zk.getACL("/e", new Stat()));
}

@Test
public void testAddWatchWithoutModeUsesDefaultMode() throws Exception {
final ZooKeeper zk = createClient();
ZooKeeperMain zkMain = new ZooKeeperMain(zk);

zkMain.cl.parseCommand("addWatch -m PERSISTENT /a");
zkMain.processZKCmd(zkMain.cl);
// the command instance is shared, so the mode of the previous invocation must not leak
zkMain.cl.parseCommand("addWatch /b");
zkMain.processZKCmd(zkMain.cl);

assertEquals(Arrays.asList("/a"), zk.getPersistentWatches());
assertEquals(Arrays.asList("/b"), zk.getPersistentRecursiveWatches());
}

@Test
public void testClientReconnectWithZKClientConfig() throws Exception {
ZooKeeper zk = null;
Expand Down