-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ccmlib/node: check both pending and active tasks when waiting for com…
…pactions - Rename Node._parse_pending_tasks to Node._parse_tasks - Count all tasks, pending and active - Allow searching for tasks based on only keyspace - Update and refactor test to allow more varied cases
- Loading branch information
1 parent
eabbf9f
commit 93b5eef
Showing
2 changed files
with
133 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,95 @@ | ||
import pytest | ||
import textwrap | ||
from ccmlib.node import Node | ||
|
||
def test_parse_pending_tasks(): | ||
def verify_result(output, keyspace, column_family, expected): | ||
n = Node._parse_pending_tasks(output, keyspace, column_family) | ||
assert n == expected | ||
# Define the test cases and corresponding outputs | ||
test_cases = [ | ||
{ | ||
"id": "only_pending", | ||
"output": textwrap.dedent("""\ | ||
pending tasks: 6 | ||
- system_schema.tables: 1 | ||
- system_schema.columns: 2 | ||
- keyspace1.standard1: 3\ | ||
"""), | ||
"expected_tasks": [ | ||
("system_schema", "tables", 1), | ||
("system_schema", "columns", 2), | ||
("system_schema", None, 3), | ||
("keyspace1", "standard1", 3), | ||
("keyspace1", None, 3), | ||
(None, None, 6), | ||
("keyspace1x", None, 0), | ||
("keyspace1x", "table1x", 0), | ||
] | ||
}, | ||
{ | ||
"id": "pending_and_in_progress", | ||
"output": textwrap.dedent("""\ | ||
pending tasks: 6 | ||
- system_schema.tables: 1 | ||
- system_schema.columns: 2 | ||
- keyspace1.standard1: 3 | ||
def verify_cases(output, cases): | ||
for ks, cf, expected in cases: | ||
verify_result(output, ks, cf, expected) | ||
id compaction type keyspace table completed total unit progress | ||
8e1f2d90-a252-11ee-a7f4-1bf9ae4e6ffd COMPACTION system_schema columns 1 640 keys 0.16% | ||
Active compaction remaining time : n/a\ | ||
"""), | ||
"expected_tasks": [ | ||
("system_schema", "tables", 1), | ||
("system_schema", "columns", 3), | ||
("system_schema", None, 4), | ||
("keyspace1", "standard1", 3), | ||
("keyspace1", None, 3), | ||
(None, None, 7), | ||
("keyspace1x", None, 0), | ||
("keyspace1x", "table1x", 0), | ||
] | ||
}, | ||
{ | ||
"id": "only_in_progress", | ||
"output": textwrap.dedent("""\ | ||
pending tasks: 0 | ||
for output in [ | ||
''' | ||
pending tasks: 6 | ||
- system_schema.tables: 1 | ||
- system_schema.columns: 2 | ||
- keyspace1.standard1: 3 | ||
''', | ||
''' | ||
pending tasks: 6 | ||
- system_schema.tables: 1 | ||
- system_schema.columns: 2 | ||
- keyspace1.standard1: 3 | ||
id compaction type keyspace table completed total unit progress | ||
8e1f2d90-a252-11ee-a7f4-1bf9ae4e6ffd COMPACTION system_schema columns 1 640 keys 0.16% | ||
Active compaction remaining time : n/a\ | ||
"""), | ||
"expected_tasks": [ | ||
("system_schema", "tables", 0), | ||
("system_schema", "columns", 1), | ||
("system_schema", None, 1), | ||
("keyspace1", "standard1", 0), | ||
("keyspace1", None, 0), | ||
(None, None, 1), | ||
("keyspace1x", None, 0), | ||
("keyspace1x", "table1x", 0), | ||
] | ||
}, | ||
{ | ||
"id": "no_tasks", | ||
"output": textwrap.dedent("""\ | ||
pending tasks: 0 | ||
\ | ||
"""), | ||
"expected_tasks": [ | ||
("system_schema", "tables", 0), | ||
("system_schema", "columns", 0), | ||
("system_schema", None, 0), | ||
("keyspace1", "standard1", 0), | ||
("keyspace1", None, 0), | ||
(None, None, 0), | ||
("keyspace1x", None, 0), | ||
("keyspace1x", "table1x", 0), | ||
] | ||
} | ||
] | ||
|
||
id compaction type keyspace table completed total unit progress | ||
8e1f2d90-a252-11ee-a7f4-1bf9ae4e6ffd COMPACTION system_schema columns 1 640 | ||
keys 0.16% | ||
Active compaction remaining time : n/a | ||
''' | ||
]: | ||
verify_cases(output, [ | ||
('system_schema', 'tables', 1), | ||
('system_schema', 'columns', 2), | ||
('system_schema', None, 3), | ||
('keyspace1', 'standard1', 3), | ||
('keyspace1', None, 3), | ||
(None, None, 6), | ||
('keyspace1x', None, 0), | ||
('keyspace1x', 'table1x', 0), | ||
]) | ||
@pytest.mark.parametrize("test_case", test_cases, ids=[tc["id"] for tc in test_cases]) | ||
def test_parse_tasks(test_case): | ||
output = test_case["output"] | ||
expected_tasks = test_case["expected_tasks"] | ||
|
||
for ks, cf, expected in expected_tasks: | ||
n = Node._parse_tasks(output, ks, cf) | ||
assert n == expected, f"Expected {expected} tasks for {ks}.{cf}, but got {n}" |