Skip to content
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.

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

fix(manager): update expected error message for enospc restore test #9590

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions mgmt_cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
from sdcm.nemesis import MgmtRepair
from sdcm.utils.adaptive_timeouts import adaptive_timeout, Operations
from sdcm.utils.common import reach_enospc_on_node, clean_enospc_on_node
from sdcm.utils.issues import SkipPerIssues
from sdcm.utils.loader_utils import LoaderUtilsMixin
from sdcm.utils.time_utils import ExecutionTimer
from sdcm.sct_events.system import InfoEvent
Expand Down Expand Up @@ -830,13 +829,6 @@ def test_enospc_before_restore(self):
assert final_status == TaskStatus.ERROR, \
f"The restore task is supposed to fail, since node {target_node} lacks the disk space to download" \
f"the snapshot files"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be useful to at least print error mesage with log.info level for clarity in case someone once needed to verify the flow.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of message you'd like to see in log.info for such case?
I supposed the assertion message is quite enough to understand the testing scenario if someone wants to verify it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to log full_progress_string = restore_task.progress_string(parse_table_res=False, is_verify_errorless_result=True).stdout instead of asserting it (as its prone to change)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got your point, but it seems to me it makes little sense.. When we analyze Manager failures, we usually look into sct python log. It contains all sctool outputs logged. full_progress_string can be easily found there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, looks it's good to go then

if not SkipPerIssues("scylladb/scylla-manager#4087", self.params):
full_progress_string = restore_task.progress_string(parse_table_res=False,
is_verify_errorless_result=True).stdout
assert "not enough disk space" in full_progress_string.lower(), \
f"The restore failed as expected when one of the nodes was out of disk space, " \
f"but with an ill fitting error message: {full_progress_string}"
finally:
clean_enospc_on_node(target_node=target_node, sleep_time=30)
self.log.info('finishing test_enospc_before_restore')
Expand Down
Loading