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

[Backport 2024.1] fix(sstbale dump): select the suitable sstable-dump command everywhere it is used #9740

Merged
merged 3 commits into from
Jan 11, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 9, 2025

rewrite a new util function of get_sstable_dump_command() to be used across sct tests.
refs: #6828

refs: #5737 (comment)

Testing

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

(cherry picked from commit f1bdc1d)

Parent PR: #9499

…e it is used

rewrite a new util function of get_sstable_dump_command() to be used across sct tests.
refs: #6828

refs: #5737 (comment)
(cherry picked from commit f1bdc1d)

# Conflicts:
#	upgrade_test.py
@mergify mergify bot added the conflicts label Jan 9, 2025
Copy link
Author

mergify bot commented Jan 9, 2025

Cherry-pick of f1bdc1d has failed:

On branch mergify/bp/branch-2024.1/pr-9499
Your branch is up to date with 'origin/branch-2024.1'.

You are currently cherry-picking commit f1bdc1d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   sdcm/utils/sstable/sstable_utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   upgrade_test.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot marked this pull request as draft January 9, 2025 16:48
@fruch fruch removed the conflicts label Jan 11, 2025
@fruch fruch marked this pull request as ready for review January 11, 2025 20:32
@fruch fruch merged commit 65d6d39 into branch-2024.1 Jan 11, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants