[Backport perf-v15] fix(ScyllaYaml): replace enable_tablets with tablets_mode_for_new_keyspaces

configurations/force-gossip-topology-changes.yaml

@@ -1,3 +1,4 @@
 append_scylla_yaml:
   force_gossip_topology_changes: true
   enable_tablets: false
+  tablets_mode_for_new_keyspaces: 'disabled'

configurations/tablets-initial-32.yaml

@@ -1,3 +1,4 @@
 append_scylla_yaml:
   enable_tablets: true
+  tablets_mode_for_new_keyspaces: 'enabled'
   tablets_initial_scale_factor: 4

configurations/tablets_disabled.yaml

@@ -1,2 +1,3 @@
 append_scylla_yaml:
   enable_tablets: false
+  tablets_mode_for_new_keyspaces: 'disabled'

docker/scylla-sct/entry.sh

@@ -12,5 +12,6 @@ authorizer: 'CassandraAuthorizer'
 EOM
 
 sed -e '/enable_tablets:.*/s/true/false/g' -i /etc/scylla/scylla.yaml
+sed -e '/tablets_mode_for_new_keyspaces:.*/s/enabled/disabled/g' -i /etc/scylla/scylla.yaml
 
 /docker-entrypoint.py $*

docker/scylla-sct/entry_ssl.sh

@@ -19,5 +19,6 @@ client_encryption_options:
 EOM
 
 sed -e '/enable_tablets:.*/s/true/false/g' -i /etc/scylla/scylla.yaml
+sed -e '/tablets_mode_for_new_keyspaces:.*/s/enabled/disabled/g' -i /etc/scylla/scylla.yaml
 
 /docker-entrypoint.py $*

sdcm/provision/scylla_yaml/scylla_yaml.py

@@ -343,6 +343,7 @@ def set_authorizer(cls, authorizer: str):
     compaction_collection_items_count_warning_threshold: int = None  # None
 
     enable_tablets: bool = None  # False, but default scylla.yaml for some versions (e.g. 6.0) override it to True
+    tablets_mode_for_new_keyspaces: Literal['disabled', 'enabled', 'enforced'] = None  # enabled
     force_gossip_topology_changes: bool = None  # False
 
     def dict(  # pylint: disable=arguments-differ

sdcm/utils/features.py

@@ -79,5 +79,7 @@ def is_tablets_feature_enabled(node) -> bool:
             return True
         if scylla_yaml.dict().get("enable_tablets"):
             return True
+        if scylla_yaml.dict().get("tablets_mode_for_new_keyspaces") in ["enabled", "enforced"]:
+            return True
 
     return False

test-cases/PR-provision-test-docker.yaml

@@ -16,3 +16,7 @@ nemesis_filter_seeds: false
 user_prefix: 'PR-provision-docker'
 
 use_mgmt: false
+
+append_scylla_yaml:
+  enable_tablets: false  # counters are not supported with tablets
+  tablets_mode_for_new_keyspaces: 'disabled'  # counters are not supported with tablets

test-cases/PR-provision-test.yaml

@@ -28,3 +28,7 @@ user_prefix: 'PR-provision-test'
 instance_provision: 'spot'
 
 use_preinstalled_scylla: true
+
+append_scylla_yaml:
+  enable_tablets: false  # counters are not supported with tablets
+  tablets_mode_for_new_keyspaces: 'disabled'  # counters are not supported with tablets

unit_tests/test_scylla_yaml.py

@@ -400,6 +400,7 @@ def test_scylla_yaml(self):
                 'workdir': None,
                 'write_request_timeout_in_ms': None,
                 'enable_tablets': None,
+                'tablets_mode_for_new_keyspaces': None,
                 'force_gossip_topology_changes': None,
             }
         )

upgrade_test.py

@@ -216,6 +216,8 @@ def _upgrade_node(self, node, upgrade_sstables=True, new_scylla_repo=None, new_v
 
         if self.params.get("enable_tablets_on_upgrade"):
             scylla_yaml_updates.update({"experimental_features": ["tablets", "consistent-topology-changes"]})
+            scylla_yaml_updates.update({"enable_tablets": True})
+            scylla_yaml_updates.update({"tablets_mode_for_new_keyspaces": "enabled"})
 
         if self.params.get('test_sst3'):
             scylla_yaml_updates.update({"enable_sstables_mc_format": True})