Skip to content

test: osd-scrub-snaps.sh: fix expected 'missing snaps' log string#45239

Merged
ronen-fr merged 1 commit intoceph:masterfrom
ronen-fr:wip-rf-54458-snaps
Mar 3, 2022
Merged

test: osd-scrub-snaps.sh: fix expected 'missing snaps' log string#45239
ronen-fr merged 1 commit intoceph:masterfrom
ronen-fr:wip-rf-54458-snaps

Conversation

@ronen-fr
Copy link
Contributor

@ronen-fr ronen-fr commented Mar 3, 2022

The test expects the following line:
"...found snap mapper error on pg ... oid ... snaps missing in mapper, should be: 1,2,3,4,5,6,7 was r -2...repaired"
while up-to-date scrubber code does not emit the 'was r -2' part. As the list is always empty for missing snaps,
and the r is always '-2' - this part of the message is just confusing.

Fix the expected log message to match the scrub code, by removing the redundant part.

Fixes: https://tracker.ceph.com/issues/54458

Signed-off-by: Ronen Friedman rfriedma@redhat.com

Fix the expected log message to match the scrub code, by removing
the redundant part.

Fixes: https://tracker.ceph.com/issues/54458

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
@ronen-fr
Copy link
Contributor Author

ronen-fr commented Mar 3, 2022

jenkins test make check

@ronen-fr
Copy link
Contributor Author

ronen-fr commented Mar 3, 2022

Merging w/o Teuthology tests: the test fixed here fails in Teu, so no harm can be caused by the proposed change.

@ronen-fr ronen-fr merged commit 2430383 into ceph:master Mar 3, 2022
@ronen-fr ronen-fr deleted the wip-rf-54458-snaps branch March 3, 2022 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants