Skip to content

ZOOKEEPER-5069: Add AdminServer command to query watch registration details #2426

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
hedong1123 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ZOOKEEPER-5069: Add AdminServer command to query watch registration details #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
accfd2f
ZOOKEEPER-5069: Add AdminServer command to query watch registration d…
Jul 20, 2026
93ba3cc
Merge branch 'refs/heads/master' into ZOOKEEPER-5069
Jul 20, 2026
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
31 changes: 31 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.apache.zookeeper.data.StatPersisted;
import org.apache.zookeeper.server.watch.IWatchManager;
import org.apache.zookeeper.server.watch.WatchManagerFactory;
import org.apache.zookeeper.server.watch.WatchRegistration;
import org.apache.zookeeper.server.watch.WatcherMode;
import org.apache.zookeeper.server.watch.WatcherOrBitSet;
import org.apache.zookeeper.server.watch.WatchesPathReport;
Expand Down Expand Up @@ -1429,6 +1430,36 @@ public synchronized WatchesPathReport getWatchesByPath() {
return dataWatches.getWatchesByPath();
}

/**
* Returns bounded Data Watch registrations.
*
* @param path exact path filter, or null for every path
* @param sessionIds Session ID filter, or null for every session
* @param maxResults maximum registrations to return
* @return matching Data Watch registrations
*/
public List<WatchRegistration> getDataWatchRegistrations(
String path,
Set<Long> sessionIds,
int maxResults) {
return dataWatches.getWatchRegistrations(path, sessionIds, maxResults);
}

/**
* Returns bounded Children Watch registrations.
*
* @param path exact path filter, or null for every path
* @param sessionIds Session ID filter, or null for every session
* @param maxResults maximum registrations to return
* @return matching Children Watch registrations
*/
public List<WatchRegistration> getChildWatchRegistrations(
String path,
Set<Long> sessionIds,
int maxResults) {
return childWatches.getWatchRegistrations(path, sessionIds, maxResults);
}

/**
* Returns a watch summary.
*
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/server/DumbWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public long getMostRecentZxid() {


@Override
int getSessionTimeout() {
public int getSessionTimeout() {
return 0;
}

Expand Down
7 changes: 6 additions & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerCnxn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ public ServerCnxn(final ZooKeeperServer zkServer) {
*/
private volatile boolean invalid = false;

abstract int getSessionTimeout();
/**
* Returns the negotiated session timeout in milliseconds.
*
* @return session timeout in milliseconds
*/
public abstract int getSessionTimeout();

public void incrOutstandingAndCheckThrottle(RequestHeader h) {
if (h.getXid() <= 0) {
Expand Down
Loading