Skip to content

Prepare for ScyllaDB move to host ids instead of ips #645

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

Merged
merged 2 commits into from
Mar 25, 2025
Merged

Prepare for ScyllaDB move to host ids instead of ips #645

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
c9e2f81
ccmlib/node: make it possible to get host id for a node that is down
Mar 24, 2025
6ecff0b
ccmlib/node: check for both IP and ID in the log output
Mar 24, 2025
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
4 changes: 2 additions & 2 deletions ccmlib/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def watch_log_for_death(self, nodes, from_mark=None, timeout=600, filename='syst
the log is watched from the beginning.
"""
tofind = nodes if isinstance(nodes, list) else [nodes]
tofind = [f"{node.address()}.* now (dead|DOWN)" for node in tofind]
tofind = [f"({node.address()}|{node.hostid()}).* now (dead|DOWN)" for node in tofind]
self.watch_log_for(tofind, from_mark=from_mark, timeout=timeout, filename=filename)

def watch_log_for_alive(self, nodes, from_mark=None, timeout=120, filename='system.log'):
Expand All @@ -531,7 +531,7 @@ def watch_log_for_alive(self, nodes, from_mark=None, timeout=120, filename='syst
nodes are marked UP. This method works similarly to watch_log_for_death.
"""
tofind = nodes if isinstance(nodes, list) else [nodes]
tofind = [f"{node.address()}.* now UP" for node in tofind]
tofind = [f"({node.address()}|{node.hostid()}).* now UP" for node in tofind]
self.watch_log_for(tofind, from_mark=from_mark, timeout=timeout, filename=filename)

def wait_for_binary_interface(self, **kwargs):
Expand Down
4 changes: 4 additions & 0 deletions ccmlib/scylla_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,10 @@ def rollback(self, upgrade_to_version):
def hostid(self, timeout=60, force_refresh=False):
if self.node_hostid and not force_refresh:
return self.node_hostid
m = self.grep_log("init - Setting local host id to (.+?)$")
if m:
self.node_hostid = m[-1][1].group(1)
return self.node_hostid
try:
node_address = self.address()
url = f"http://{node_address}:{self.api_port}/storage_service/hostid/local"
Expand Down