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(nemesis): make sure set_target_node always set current_disruption #8471

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 27, 2024

before there was two seprate calls to set_target_node and to set_current_disruption that could end up with set_target_node setting None to the target_node.running_nemesis

this fix move set_current_disruption into set_target_node to avoid this problem, and also introduce a new paramter to set_target_node so any user of it can set what's the data that would be saved on the target node (it's only for debugging)

Fixes: #8198

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 a12ee91)

Parent PR: #8381

@mergify mergify bot added the conflicts label Aug 27, 2024
@mergify mergify bot assigned fruch Aug 27, 2024
Copy link
Author

mergify bot commented Aug 27, 2024

Cherry-pick of a12ee91 has failed:

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

You are currently cherry-picking commit a12ee91c6.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 August 27, 2024 21:36
@fruch fruch marked this pull request as ready for review August 28, 2024 12:32
@fruch
Copy link
Contributor

fruch commented Aug 28, 2024

depeneds on #7016

@mergify mergify bot marked this pull request as draft August 28, 2024 12:33
…ion`

before there was two seprate calls to `set_target_node` and to
`set_current_disruption` that could end up with `set_target_node`
setting None to the `target_node.running_nemesis`

this fix move `set_current_disruption` into `set_target_node`
to avoid this problem, and also introduce a new paramter to
`set_target_node` so any user of it can set what's the data
that would be saved on the target node (it's only for debugging)

Fixes: #8198
(cherry picked from commit a12ee91)
@fruch fruch force-pushed the mergify/bp/branch-2024.1/pr-8381 branch from 061acbe to 3a4da15 Compare August 28, 2024 13:49
@fruch fruch removed the conflicts label Aug 28, 2024
@fruch fruch marked this pull request as ready for review August 28, 2024 13:49
@fruch fruch merged commit a568395 into branch-2024.1 Aug 28, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/branch-2024.1/pr-8381 branch August 28, 2024 18:57
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.

1 participant