Skip to content

Commit d402974

Browse files
committed
Use srvr, not stat
1 parent 1db3eec commit d402974

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

zk_shell/shell.py

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,25 +1699,14 @@ def fetch(endpoint, states, znodes, ephemerals, datasize, sessions, zxids, idx):
16991699
datasize[idx] = int(dsize)
17001700
sessions[idx] = int(session_count)
17011701

1702-
def fetch_zxid(endpoint):
1703-
zxid = -1
1704-
try:
1705-
stat = self._zk.cmd(hosts_to_endpoints(endpoint), "stat")
1706-
for line in stat.split("\n"):
1707-
if "Zxid:" in line:
1708-
zxid = int(line.split(None)[1], 0)
1709-
except:
1710-
pass
1711-
return zxid
1712-
1713-
# the stat cmd is a bit flaky, so try a few times
1714-
zxid = -1
1715-
for i in range(0, stat_retries):
1716-
zxid = fetch_zxid(endpoint)
1717-
if zxid != -1:
1718-
break
1719-
1720-
zxids[idx]= zxid
1702+
try:
1703+
srvr = self._zk.cmd(hosts_to_endpoints(endpoint), "srvr")
1704+
for line in srvr.split("\n"):
1705+
if "Zxid:" in line:
1706+
zxids[idx] = int(line.split(None)[1], 0)
1707+
break
1708+
except:
1709+
zxids[idx] = -1
17211710

17221711
workers = []
17231712
for idx, endpoint in enumerate(endpoints, 1):

0 commit comments

Comments
 (0)