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.

Sign up for GitHub

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
Merged

[Backport 2024.1] fix(nemesis): make sure set_target_node always set current_disruption #8471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions sdcm/nemesis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ def _get_target_nodes(
nodes = [node for node in nodes if node.rack == rack]
return nodes

def set_target_node(self, dc_idx: Optional[int] = None, rack: Optional[int] = None,
def set_target_node(self, dc_idx: Optional[int] = None, rack: Optional[int] = None, # pylint: disable=too-many-arguments
is_seed: Union[bool, DefaultValue, None] = DefaultValue,
allow_only_last_node_in_rack: bool = False):
allow_only_last_node_in_rack: bool = False, current_disruption=None):
"""Set a Scylla node as target node.

if is_seed is None - it will ignore seed status of the nodes
Expand All @@ -402,7 +402,13 @@ def set_target_node(self, dc_idx: Optional[int] = None, rack: Optional[int] = No
else:
self.target_node = random.choice(nodes)

self.target_node.running_nemesis = self.current_disruption
if current_disruption:
self.target_node.running_nemesis = current_disruption
self.set_current_disruption(current_disruption)
elif self.current_disruption:
self.target_node.running_nemesis = self.current_disruption
else:
raise ValueError("current_disruption is not set")
self.log.info('Current Target: %s with running nemesis: %s',
self.target_node, self.target_node.running_nemesis)

Expand Down Expand Up @@ -661,7 +667,6 @@ def _get_random_non_system_ks_cf(self, filter_empty_tables: bool = True) -> tupl
return None, None

def _prepare_start_stop_compaction(self) -> StartStopCompactionArgs:
self.set_target_node()
ks, cf = self._get_random_non_system_ks_cf()

if not ks or not cf:
Expand Down Expand Up @@ -1270,6 +1275,7 @@ def _terminate_cluster_node(self, node):

def _nodetool_decommission(self, add_node=True):
if self._is_it_on_kubernetes():
self.unset_current_running_nemesis(self.target_node)
self.set_target_node(allow_only_last_node_in_rack=True)
target_is_seed = self.target_node.is_seed
self.cluster.decommission(self.target_node)
Expand Down Expand Up @@ -5067,7 +5073,7 @@ def data_validation_prints(args):
args[0].log.debug(f'Data validator error: {err}')

@wraps(method)
def wrapper(*args, **kwargs): # pylint: disable=too-many-statements
def wrapper(*args, **kwargs): # pylint: disable=too-many-statements # noqa: PLR0914
# pylint: disable=too-many-locals
# pylint: disable=too-many-branches
method_name = method.__name__
Expand All @@ -5082,9 +5088,8 @@ def wrapper(*args, **kwargs): # pylint: disable=too-many-statements
# NOTE: exclusive nemesis will wait before the end of all other ones
time.sleep(10)

args[0].current_disruption = "".join(p.capitalize() for p in method_name.replace("disrupt_", "").split("_"))
args[0].set_current_disruption(f"{args[0].current_disruption}")
args[0].set_target_node()
current_disruption = "".join(p.capitalize() for p in method_name.replace("disrupt_", "").split("_"))
args[0].set_target_node(current_disruption=current_disruption)

args[0].cluster.check_cluster_health()
num_nodes_before = len(args[0].cluster.nodes)
Expand Down