Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
Handle difference in sstablemetadata output for pending repairs follo…
Browse files Browse the repository at this point in the history
…wing CASSANDRA-11483
  • Loading branch information
jkni committed Aug 9, 2017
1 parent 9592087 commit f55f78b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions repair_tests/incremental_repair_test.py
Expand Up @@ -34,7 +34,7 @@ class TestIncRepair(Tester):
def _get_repaired_data(cls, node, keyspace):
_sstable_name = compile('SSTable: (.+)')
_repaired_at = compile('Repaired at: (\d+)')
_pending_repair = compile('Pending repair: (null|[a-f0-9\-]+)')
_pending_repair = compile('Pending repair: (\-\-|null|[a-f0-9\-]+)')
_sstable_data = namedtuple('_sstabledata', ('name', 'repaired', 'pending_id'))

out = node.run_sstablemetadata(keyspace=keyspace).stdout
Expand All @@ -45,7 +45,7 @@ def matches(pattern):
repaired_times = [int(m.group(1)) for m in matches(_repaired_at)]

def uuid_or_none(s):
return None if s == 'null' else UUID(s)
return None if s == 'null' or s == '--' else UUID(s)
pending_repairs = [uuid_or_none(m.group(1)) for m in matches(_pending_repair)]
assert names
assert repaired_times
Expand Down

0 comments on commit f55f78b

Please sign in to comment.