improvement(treewide): Remove Nemesis, which filter by flags

pehala · pehala · commit 3eb6b150eaed · 2025-04-03T09:23:25.000+02:00
LimitedChaosMonkey, GeminiNonDisruptiveChaosMonkey, GeminiChaosMonkey, NetworkMonkey,
NonDisruptiveMonkey, DisruptiveMonkey, FreeTierSetMonkey
diff --git a/configurations/rf1-non-disruptive.yaml b/configurations/rf1-non-disruptive.yaml
@@ -6,6 +6,7 @@ stress_cmd:
   - "cassandra-stress write cl=ONE duration=240m  -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=1)' -mode cql3 native -rate threads=250  -col 'size=FIXED(1024) n=FIXED(1)' -pop seq=400200300..600200300 -log interval=15"
 run_fullscan: ['{"mode": "table_and_aggregate", "ks_cf": "keyspace1.standard1", "interval": 5}']
 
-nemesis_class_name: 'NonDisruptiveMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "not disruptive"
 nemesis_seed: '24325345'
 user_prefix: 'longevity-200gb-48h-rf1'
diff --git a/configurations/zerotoken_nodes/zero_nodes_nemesis_set.yaml b/configurations/zerotoken_nodes/zero_nodes_nemesis_set.yaml
@@ -1,3 +1,4 @@
-nemesis_class_name: 'ZeroTokenSetMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "zero_node_changes"
 use_zero_nodes: true
 zero_token_instance_type_db: 'i4i.large'
diff --git a/docs/configuration_options.md b/docs/configuration_options.md
@@ -962,7 +962,7 @@ More arguments to append to scylla-node-exporter command line
 
 ## **nemesis_class_name** / SCT_NEMESIS_CLASS_NAME
 
-Nemesis class to use (possible types in sdcm.nemesis).<br>Next syntax supporting:<br>- nemesis_class_name: "NemesisName"  Run one nemesis in single thread<br>- nemesis_class_name: "<NemesisName>:<num>" Run <NemesisName> in <num><br>parallel threads on different nodes. Ex.: "ChaosMonkey:2"<br>- nemesis_class_name: "<NemesisName1>:<num1> <NemesisName2>:<num2>" Run<br><NemesisName1> in <num1> parallel threads and <NemesisName2> in <num2><br>parallel threads. Ex.: "DisruptiveMonkey:1 NonDisruptiveMonkey:2"
+Nemesis class to use (possible types in sdcm.nemesis).<br>Next syntax supporting:<br>- nemesis_class_name: "NemesisName"  Run one nemesis in single thread<br>- nemesis_class_name: "<NemesisName>:<num>" Run <NemesisName> in <num><br>parallel threads on different nodes. Ex.: "ChaosMonkey:2"<br>- nemesis_class_name: "<NemesisName1>:<num1> <NemesisName2>:<num2>" Run<br><NemesisName1> in <num1> parallel threads and <NemesisName2> in <num2><br>parallel threads. Ex.: "ScyllaOperatorBasicOperationsMonkey:1 NonDisruptiveMonkey:2"
 
 **default:** NoOpMonkey
 
diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py
@@ -5627,11 +5627,9 @@ def wrapper(*args, **kwargs):  # pylint: disable=too-many-statements  # noqa: PL
 
 
 class SisyphusMonkey(Nemesis):
-    NEMESIS_SELECTOR = None
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.build_list_of_disruptions_to_execute(nemesis_selector=self.nemesis_selector)
+        self.build_list_of_disruptions_to_execute()
         self.shuffle_list_of_disruptions()
 
     def disrupt(self):
@@ -6068,35 +6066,6 @@ def _random_disrupt(self):
         self.execute_disrupt_method(bound_method)
 
 
-class LimitedChaosMonkey(SisyphusMonkey):
-    # Limit the nemesis scope:
-    #  - NodeToolCleanupMonkey
-    #  - DecommissionMonkey
-    #  - DrainerMonkey
-    #  - RefreshMonkey
-    #  - StopStartMonkey
-    #  - MajorCompactionMonkey
-    #  - ModifyTableMonkey
-    #  - EnospcMonkey
-    #  - StopWaitStartMonkey
-    #  - HardRebootNodeMonkey
-    #  - SoftRebootNodeMonkey
-    #  - TruncateMonkey
-    #  - TopPartitions
-    #  - MgmtCorruptThenRepair
-    #  - MgmtRepair
-    #  - NoCorruptRepairMonkey
-    #  - SnapshotOperations
-    #  - AbortRepairMonkey
-    #  - MgmtBackup
-    #  - MgmtBackupSpecificKeyspaces
-    #  - AddDropColumnMonkey
-    #  - PauseLdapNemesis
-    #  - ToggleLdapConfiguration
-
-    NEMESIS_SELECTOR = "limited"
-
-
 CLOUD_LIMITED_CHAOS_MONKEY = ['disrupt_nodetool_cleanup',
                               'disrupt_nodetool_drain', 'disrupt_nodetool_refresh',
                               'disrupt_stop_start_scylla_server', 'disrupt_major_compaction',
@@ -6491,59 +6460,6 @@ def disrupt(self):
         self.disrupt_network_start_stop_interface()
 
 
-class DisruptiveMonkey(SisyphusMonkey):
-    # Limit the nemesis scope:
-    #  - ValidateHintedHandoffShortDowntime
-    #  - CorruptThenRepairMonkey
-    #  - CorruptThenRebuildMonkey
-    #  - RestartThenRepairNodeMonkey
-    #  - StopStartMonkey
-    #  - MultipleHardRebootNodeMonkey
-    #  - HardRebootNodeMonkey
-    #  - SoftRebootNodeMonkey
-    #  - StopWaitStartMonkey
-    #  - NodeTerminateAndReplace
-    #  - EnospcMonkey
-    #  - DecommissionMonkey
-    #  - NodeRestartWithResharding
-    #  - DrainerMonkey
-
-    NEMESIS_SELECTOR = "disruptive"
-
-
-class NonDisruptiveMonkey(Nemesis):
-    # Limit the nemesis scope:
-    #  - NodeToolCleanupMonkey
-    #  - SnapshotOperations
-    #  - RefreshMonkey
-    #  - RefreshBigMonkey -
-    #  - NoCorruptRepairMonkey
-    #  - MgmtRepair
-    NEMESIS_SELECTOR = "not disruptive"
-
-
-class NetworkMonkey(SisyphusMonkey):
-    # Limit the nemesis scope:
-    #  - RandomInterruptionNetworkMonkey
-    #  - StopStartInterfacesNetworkMonkey
-    #  - BlockNetworkMonkey
-
-    NEMESIS_SELECTOR = "networking"
-
-
-class GeminiChaosMonkey(SisyphusMonkey):
-    # Limit the nemesis scope to use with gemini
-    # - StopStartMonkey
-    # - RestartThenRepairNodeMonkey
-
-    NEMESIS_SELECTOR = "run_with_gemini"
-
-
-class GeminiNonDisruptiveChaosMonkey(SisyphusMonkey):
-
-    NEMESIS_SELECTOR = "run_with_gemini and not disruptive"
-
-
 class ScyllaOperatorBasicOperationsMonkey(Nemesis):
     """
     Selected number of nemesis that is focused on scylla-operator functionality
@@ -6638,12 +6554,8 @@ def disrupt(self):
         self.disrupt_repair_streaming_err()
 
 
-COMPLEX_NEMESIS = [NoOpMonkey, ChaosMonkey,
-                   LimitedChaosMonkey,
-                   ScyllaCloudLimitedChaosMonkey,
-                   AllMonkey, MdcChaosMonkey,
-                   DisruptiveMonkey, NonDisruptiveMonkey, GeminiNonDisruptiveChaosMonkey,
-                   GeminiChaosMonkey, NetworkMonkey, SisyphusMonkey,
+COMPLEX_NEMESIS = [NoOpMonkey, ChaosMonkey, ScyllaCloudLimitedChaosMonkey,
+                   AllMonkey, MdcChaosMonkey, SisyphusMonkey,
                    DisruptKubernetesNodeThenReplaceScyllaNode,
                    DisruptKubernetesNodeThenDecommissionAndAddScyllaNode,
                    CategoricalMonkey]
@@ -6706,21 +6618,6 @@ def disrupt(self):
         self.disrupt_start_stop_validation_compaction()
 
 
-class FreeTierSetMonkey(SisyphusMonkey):
-    """Nemesis set for testing Scylla Cloud free tier.
-
-    Disruptions that can be caused by random failures and user actions and human operator:
-    - doesn't include any topology changes (scale up/down, decommission)
-    - doesn't include manager backup/repairs
-    - doesn't include k8s nodes related (i.e. one title as exclusive)"""
-
-    def __init__(self, *args, **kwargs):
-        # skip SisyphusMonkey __init__ to not repeat build disruption logic, but still we want to run Nemesis class __init__
-        super(SisyphusMonkey, self).__init__(*args, **kwargs)  # pylint: disable=bad-super-call
-        self.build_list_of_disruptions_to_execute(nemesis_selector='free_tier_set')
-        self.shuffle_list_of_disruptions()
-
-
 class SlaIncreaseSharesDuringLoad(Nemesis):
     disruptive = False
     sla = True
@@ -6862,20 +6759,6 @@ def disrupt(self):
         self.disrupt_grow_shrink_zero_nodes()
 
 
-class ZeroTokenSetMonkey(SisyphusMonkey):
-    """Nemesis set for testing Scylla with configured zero nodes
-
-    Disruptions that can be caused by random failures and user actions with
-    zero node configured
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(SisyphusMonkey, self).__init__(*args, **kwargs)  # pylint: disable=bad-super-call
-        self.use_all_nodes_as_target = True
-        self.build_list_of_disruptions_to_execute(nemesis_selector='zero_node_changes')
-        self.shuffle_list_of_disruptions()
-
-
 class SerialRestartOfElectedTopologyCoordinatorNemesis(Nemesis):
 
     disruptive = True
diff --git a/sdcm/sct_config.py b/sdcm/sct_config.py
@@ -651,7 +651,7 @@ class SCTConfiguration(dict):
                       parallel threads on different nodes. Ex.: "ChaosMonkey:2"
                     - nemesis_class_name: "<NemesisName1>:<num1> <NemesisName2>:<num2>" Run
                       <NemesisName1> in <num1> parallel threads and <NemesisName2> in <num2>
-                      parallel threads. Ex.: "DisruptiveMonkey:1 NonDisruptiveMonkey:2"
+                      parallel threads. Ex.: "ScyllaOperatorBasicOperationsMonkey:1 NonDisruptiveMonkey:2"
             """),
 
         dict(name="nemesis_interval", env="SCT_NEMESIS_INTERVAL",
diff --git a/test-cases/PR-provision-test-docker.yaml b/test-cases/PR-provision-test-docker.yaml
@@ -9,7 +9,8 @@ n_db_nodes: 1
 
 instance_type_runner: c6i.2xlarge
 
-nemesis_class_name: NonDisruptiveMonkey
+nemesis_class_name: SisyphusMonkey
+nemesis_selector: "not disruptive"
 nemesis_interval: 1
 
 user_prefix: 'PR-provision-docker'
diff --git a/test-cases/PR-provision-test.yaml b/test-cases/PR-provision-test.yaml
@@ -21,7 +21,8 @@ force_run_iotune: true
 n_monitor_nodes: 1
 n_db_nodes: 3
 
-nemesis_class_name: NonDisruptiveMonkey
+nemesis_class_name: SisyphusMonkey
+nemesis_selector: "not disruptive"
 nemesis_interval: 1
 
 user_prefix: 'PR-provision-test'
diff --git a/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml b/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml
@@ -8,7 +8,8 @@ instance_type_db: 'i4i.large'
 user_prefix: 'ics-cdc-gemini-basic-3h'
 ami_db_scylla_user: 'centos'
 
-nemesis_class_name: 'GeminiChaosMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "run_with_gemini"
 
 gemini_cmd: |
   --duration 3h
diff --git a/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml b/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml
@@ -8,7 +8,8 @@ instance_type_db: 'i4i.large'
 user_prefix: 'ics-gemini-nemesis-3h'
 ami_db_scylla_user: 'centos'
 
-nemesis_class_name: 'GeminiNonDisruptiveChaosMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "run_with_gemini and not disruptive"
 
 gemini_cmd: |
   --duration 3h
diff --git a/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml b/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml
@@ -7,7 +7,8 @@ instance_type_db: 'i4i.xlarge'
 
 user_prefix: 'gemini-basic-3h'
 
-nemesis_class_name: 'GeminiNonDisruptiveChaosMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "run_with_gemini and not disruptive"
 
 gemini_cmd: |
   --duration 3h
diff --git a/test-cases/longevity/longevity-1-rf-test-12h.yaml b/test-cases/longevity/longevity-1-rf-test-12h.yaml
@@ -26,7 +26,8 @@ round_robin: true
 instance_type_db: 'i4i.xlarge'
 instance_type_loader: 'c6i.4xlarge'
 
-nemesis_class_name: 'NonDisruptiveMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "not disruptive"
 
 user_prefix: 'longevity-1-rf-test-4h'
 space_node_threshold: 64424
diff --git a/test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml b/test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml
@@ -29,8 +29,8 @@ instance_type_loader: 'c6i.2xlarge'
 instance_type_runner: 'r6i.2xlarge'
 
 cluster_health_check: false
-nemesis_class_name: 'DisruptiveMonkey:1 NonDisruptiveMonkey:2'
-nemesis_selector: ["", "", "not manager_operation"]
+nemesis_class_name: 'SisyphusMonkey:1 SisyphusMonkey:2'
+nemesis_selector: ["disruptive", "not disruptive", "not disruptive and not manager_operation"]
 nemesis_interval: 30
 nemesis_during_prepare: false
 seeds_num: 3
diff --git a/test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml b/test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml
@@ -9,8 +9,8 @@ n_monitor_nodes: 1
 
 instance_type_db: 'i4i.2xlarge'
 
-nemesis_class_name: 'DisruptiveMonkey:1 NonDisruptiveMonkey:2'
-nemesis_selector: ["", "", "not manager_operation"]
+nemesis_class_name: 'SisyphusMonkey:1 SisyphusMonkey:2'
+nemesis_selector: ["disruptive", "not disruptive", "not disruptive and not manager_operation"]
 nemesis_during_prepare: false
 space_node_threshold: 64424
 
diff --git a/test-cases/longevity/longevity-lwt-parallel-24h.yaml b/test-cases/longevity/longevity-lwt-parallel-24h.yaml
@@ -12,7 +12,8 @@ round_robin: true
 
 instance_type_db: 'i4i.2xlarge'
 
-nemesis_class_name: 'DisruptiveMonkey:1 ModifyTableMonkey:1'
+nemesis_class_name: 'SisyphusMonkey:1 ModifyTableMonkey:1'
+nemesis_selector: ["disruptive", ""]
 nemesis_during_prepare: false
 space_node_threshold: 64424
 
diff --git a/test-cases/longevity/longevity-nosqlbench-3h.yaml b/test-cases/longevity/longevity-nosqlbench-3h.yaml
@@ -12,7 +12,8 @@ instance_type_db: 'i4i.4xlarge'
 gce_instance_type_db: 'n2-highmem-16'
 gce_instance_type_loader: 'e2-standard-4'
 
-nemesis_class_name: 'NonDisruptiveMonkey'
+nemesis_class_name: 'SisyphusMonkey'
+nemesis_selector: "not disruptive"
 nemesis_interval: 10
 
 user_prefix: 'longevity-nosqlbench-3h'
diff --git a/test-cases/scylla-operator/longevity-scylla-operator-12h-multitenant-14-clients.yaml b/test-cases/scylla-operator/longevity-scylla-operator-12h-multitenant-14-clients.yaml
@@ -33,11 +33,11 @@ instance_type_loader: 'c6i.large'
 k8s_minio_storage_size: 1024Gi
 
 nemesis_class_name:
-  - 'FreeTierSetMonkey'
-  - 'FreeTierSetMonkey'
-  - 'FreeTierSetMonkey'
-  - 'FreeTierSetMonkey'
-  - 'FreeTierSetMonkey'
+  - 'SisyphusMonkey'
+  - 'SisyphusMonkey'
+  - 'SisyphusMonkey'
+  - 'SisyphusMonkey'
+  - 'SisyphusMonkey'
   - 'NoOpMonkey'
   - 'NoOpMonkey'
   - 'NoOpMonkey'
@@ -47,6 +47,21 @@ nemesis_class_name:
   - 'NoOpMonkey'
   - 'NoOpMonkey'
   - 'NoOpMonkey'
+nemesis_selector:
+  - "free_tier_set"
+  - "free_tier_set"
+  - "free_tier_set"
+  - "free_tier_set"
+  - "free_tier_set"
+  - ""
+  - ""
+  - ""
+  - ""
+  - ""
+  - ""
+  - ""
+  - ""
+  - ""
 nemesis_seed: ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14']
 nemesis_during_prepare: false
 
diff --git a/test-cases/scylla-operator/longevity-scylla-operator-3h-multitenant.yaml b/test-cases/scylla-operator/longevity-scylla-operator-3h-multitenant.yaml
@@ -28,7 +28,8 @@ k8s_n_loader_pods_per_cluster: 2
 
 k8s_n_auxiliary_nodes: 3
 
-nemesis_class_name: ['FreeTierSetMonkey', 'K8sSetMonkey']
+nemesis_class_name: ['SisyphusMonkey', 'K8sSetMonkey']
+nemesis_selector: ["free_tier_set", ""]
 nemesis_interval: [5, 6]
 nemesis_seed: ['385', '543']
 nemesis_during_prepare: false
diff --git a/unit_tests/test_data/test_scylla_yaml_builders/PR-provision-test.yaml b/unit_tests/test_data/test_scylla_yaml_builders/PR-provision-test.yaml
@@ -21,7 +21,8 @@ force_run_iotune: true
 n_monitor_nodes: 1
 n_db_nodes: 3
 
-nemesis_class_name: NonDisruptiveMonkey
+nemesis_class_name: SisyphusMonkey
+nemesis_selector: "not disruptive"
 nemesis_interval: 1
 
 user_prefix: 'PR-provision-test'
