bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

tools/scylla-nodetool: netstats: don't assume both senders and receivers

Browse Source 
The code currently assumes that a session has both sender and receiver
streams, but it is possible to have just one or the other.
Change the test to include this scenario and remove this assumption from
the code.

Fixes: #22770

Closes scylladb/scylladb#22771
This commit is contained in:
Botond Dénes
2025-02-10 06:57:08 -05:00
committed by Avi Kivity
parent 1b44861e8f
commit 87e8e00de6
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/nodetool/test_netstats.py
View File

@@ -44,8 +44,10 @@ class test_flag(Enum):
private_ip = 2
one_stream = 3
no_streams = 4
human_readable_short = 5
human_readable_long = 6
sender_only = 5
receiver_only = 6
human_readable_short = 7
human_readable_long = 8
class SessionSummary():
@@ -114,8 +116,8 @@ def _check_output(
assert lines[i] == f' /{session["peer"]} (using /{session["connecting"]})'
for summaries, files, action_continuous, action_perfect, target in (
(session["receiving_summaries"], session["receiving_files"], "Receiving", "received", "from"),
(session["sending_summaries"], session["sending_files"], "Sending", "sent", "to")):
(session.get("receiving_summaries", []), session.get("receiving_files", []), "Receiving", "received", "from"),
(session.get("sending_summaries", []), session.get("sending_files", []), "Sending", "sent", "to")):
if not summaries:
continue
i += 1
@@ -189,6 +191,8 @@ def _check_output(
test_flag.private_ip,
test_flag.one_stream,
test_flag.no_streams,
test_flag.sender_only,
test_flag.receiver_only,
test_flag.human_readable_short,
test_flag.human_readable_long))
def test_netstats(nodetool, flag):
@@ -312,6 +316,14 @@ def test_netstats(nodetool, flag):
del streams[1]
elif flag == test_flag.no_streams or flag == test_flag.starting_mode:
streams.clear()
elif flag == test_flag.sender_only:
for session in streams[0]["sessions"]:
del session["receiving_summaries"]
del session["receiving_files"]
elif flag == test_flag.receiver_only:
for session in streams[0]["sessions"]:
del session["sending_summaries"]
del session["sending_files"]
read_repair_attempted = 78680
read_repair_repaired_blocking = 78678

8
tools/scylla-nodetool.cc
View File

@@ -1208,8 +1208,12 @@ void netstats_operation(scylla_rest_client& client, const bpo::variables_map& vm
fmt::print(std::cout, " (using /{})", private_ip);
}
fmt::print(std::cout, "\n");
print_stream_session(session["receiving_summaries"], session["receiving_files"], "Receiving", "received", "from", human_readable);
print_stream_session(session["sending_summaries"], session["sending_files"], "Sending", "sent", "to", human_readable);
if (session.HasMember("receiving_summaries")) {
print_stream_session(session["receiving_summaries"], session["receiving_files"], "Receiving", "received", "from", human_readable);
}
if (session.HasMember("sending_summaries")) {
print_stream_session(session["sending_summaries"], session["sending_files"], "Sending", "sent", "to", human_readable);
}
}
}
}