feature(unit_test): drop unnecessary experimental_features

in a previous change, all experimental features which were previous enabled by '--experimental' were re-enabled. this brings the test to the state before scylla dropped the 'experimental' option. but quite a few tests either does not exercise any of the experimental or just need a certain one of them. so, in this change, we either drop the full set of default-enabled experimental features or just enable the one to be tested. Signed-off-by: Kefu Chai <[email protected]>
enaydanov · Sep 3, 2023 · 6c353ad · 6c353ad
1 parent 0098722
commit 6c353ad
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 49 deletions.
diff --git a/configurations/raft/enable_raft_experimental.yaml b/configurations/raft/enable_raft_experimental.yaml
@@ -1,6 +1,3 @@
 append_scylla_yaml: |
   experimental_features:
-    - alternator-streams
-    - alternator-ttl
-    - keyspace-storage-options
     - raft
diff --git a/defaults/test_default.yaml b/defaults/test_default.yaml
@@ -14,10 +14,6 @@ manager_scylla_backend_version: '2022'
 
 scylla_repo_loader: 'https://s3.amazonaws.com/downloads.scylladb.com/rpm/centos/scylla-4.6.repo'
 
-experimental_features:
-  - alternator-streams
-  - alternator-ttl
-  - keyspace-storage-options
 round_robin: false
 
 append_scylla_args: '--blocked-reactor-notify-ms 25 --abort-on-lsa-bad-alloc 1 --abort-on-seastar-bad-alloc --abort-on-internal-error 1 --abort-on-ebadf 1 --enable-sstable-key-validation 1'

diff --git a/internal_test_data/complex_test_case_with_version.yaml b/internal_test_data/complex_test_case_with_version.yaml
@@ -19,10 +19,6 @@ nemesis_interval: 5
 user_prefix: 'longevity-50gb-4d-not-jenkins'
 space_node_threshold: 644245094
 ip_ssh_connections: 'private'
-experimental_features:
-  - alternator-streams
-  - alternator-ttl
-  - keyspace-storage-options
 instance_provision: 'on_demand'
 
 

diff --git a/sdcm/fill_db_data.py b/sdcm/fill_db_data.py
@@ -436,7 +436,6 @@ class FillDatabaseData(ClusterTester):
                 [[-4]]
             ],
             'min_version': '1.7',
-            'skip_condition': "'experimental_features' in self.params",
             'max_version': '',
             'skip': ''},
         {

diff --git a/...lternator-ttl/longevity-alternator-1h-scan-12h-ttl-no-lwt-2h-grace-4loaders-sisyphus.yaml b/...lternator-ttl/longevity-alternator-1h-scan-12h-ttl-no-lwt-2h-grace-4loaders-sisyphus.yaml
@@ -62,9 +62,7 @@ alternator_secret_access_key: 'password'
 # Enable TTL feature in Scylla.
 # Set 'alternator_ttl_period_in_seconds' to 1 hour for the TTL scan interval.
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 3600
 

diff --git a/...ator-ttl/longevity-alternator-4m-scan-36m-ttl-8m-grace-sisyphus-rewrite-expired-data.yaml b/...ator-ttl/longevity-alternator-4m-scan-36m-ttl-8m-grace-sisyphus-rewrite-expired-data.yaml
@@ -54,9 +54,7 @@ alternator_secret_access_key: 'password'
 # Set 'alternator_ttl_period_in_seconds' to 1 hour for the TTL scan interval.
 # Set 'gc_grace_seconds' for 8 minutes.
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 240
 

diff --git a/test-cases/features/alternator-ttl/longevity-alternator-4m-scan-multiple-ttl-8m-grace.yaml b/test-cases/features/alternator-ttl/longevity-alternator-4m-scan-multiple-ttl-8m-grace.yaml
@@ -102,9 +102,7 @@ alternator_secret_access_key: 'password'
 # TTL: 16 different ones. The longer is 10 days, the second longer is 2.5 hours
 # GC Grace: 8 minutes
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 240
 

diff --git a/test-cases/features/alternator-ttl/longevity-alternator-disable-enable-ttl.yaml b/test-cases/features/alternator-ttl/longevity-alternator-disable-enable-ttl.yaml
@@ -53,9 +53,7 @@ alternator_secret_access_key: 'password'
 # (YCSB TTL parameter is set to 10 minutes)
 # Set 'gc_grace_seconds' for 8 minutes,
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 240
 

diff --git a/test-cases/features/alternator-ttl/longevity-alternator-ttl-big-dataset.yaml b/test-cases/features/alternator-ttl/longevity-alternator-ttl-big-dataset.yaml
@@ -59,9 +59,7 @@ alternator_secret_access_key: 'password'
 # Set 'alternator_ttl_period_in_seconds' to 1 hour for the TTL scan interval.
 # gc_grace_seconds: 2 hours.
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 3600
 

diff --git a/test-cases/features/alternator-ttl/longevity-alternator-ttl-large-writes.yaml b/test-cases/features/alternator-ttl/longevity-alternator-ttl-large-writes.yaml
@@ -59,9 +59,7 @@ alternator_secret_access_key: 'password'
 # TTL (YCSB parameter): 8 minutes.
 # gc_grace_seconds: 20 minutes
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 600
 

diff --git a/test-cases/features/alternator-ttl/longevity-alternator-ttl-lwt.yaml b/test-cases/features/alternator-ttl/longevity-alternator-ttl-lwt.yaml
@@ -40,8 +40,6 @@ alternator_secret_access_key: 'password'
 # Enable TTL feature in Scylla.
 # Set 'alternator_ttl_period_in_seconds' to 7 minutes for the TTL scan interval.
 experimental_features:
-  - alternator-streams
   - alternator-ttl
-  - keyspace-storage-options
 append_scylla_yaml: |
   alternator_ttl_period_in_seconds: 420
diff --git a/test-cases/longevity/longevity-alternator-streams-100gb-12h.yaml b/test-cases/longevity/longevity-alternator-streams-100gb-12h.yaml
@@ -48,8 +48,6 @@ user_prefix: 'alternator-streams-4h'
 space_node_threshold: 64424
 experimental_features:
   - alternator-streams
-  - alternator-ttl
-  - keyspace-storage-options
 
 alternator_port: 8080
 dynamodb_primarykey_type: HASH

diff --git a/test-cases/longevity/longevity-cdc-100gb-4h.yaml b/test-cases/longevity/longevity-cdc-100gb-4h.yaml
@@ -24,5 +24,3 @@ user_prefix: 'longevity-cdc-100gb-4h'
 space_node_threshold: 64424
 
 server_encrypt: true
-
-experimental_features: []
diff --git a/test-cases/scale/scale-cluster.yaml b/test-cases/scale/scale-cluster.yaml
@@ -14,7 +14,6 @@ instance_type_db: 'm5d.large'
 
 user_prefix: 'cluster-scale-test'
 ssh_transport: 'libssh2'
-experimental_features: []
 use_legacy_cluster_init: true
 
 nemesis_interval: 5

diff --git a/unit_tests/conftest.py b/unit_tests/conftest.py
@@ -77,16 +77,8 @@ def fixture_docker_scylla(request: pytest.FixtureRequest):
             os.chdir(curr_dir)
 
     ssl_dir = (Path(__file__).parent.parent / 'data_dir' / 'ssl_conf').absolute()
-    # experimental features previous enabled by '--experimental' umbrella flag, which
-    # was deprecated and removed, so let's specify them explictly. 'udf' should be
-    # enabled separately along with 'enable_user_defined_functions'
-    experimental_features = ['alternator-streams',
-                             'alternator-ttl',
-                             'keyspace-storage-options']
-    experimental_flags = ' '.join(f'--experimental-features {feature}'
-                                  for feature in experimental_features)
     scylla = RemoteDocker(LocalNode("scylla", cluster), image_name=docker_version,
-                          command_line=f"--smp 1 {experimental_flags} {alternator_flags}",
+                          command_line=f"--smp 1 {alternator_flags}",
                           extra_docker_opts=(f'-p 8000 -p {BaseNode.CQL_PORT} --cpus="1" -v {entryfile_path}:/entry.sh'
                                              f' -v {ssl_dir}:/etc/scylla/ssl_conf'
                                              ' --entrypoint /entry.sh'))

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/PR-provision-test.result.json b/unit_tests/test_data/test_scylla_yaml_builders/PR-provision-test.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/artifact_amazon2.result.json b/unit_tests/test_data/test_scylla_yaml_builders/artifact_amazon2.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.result.json b/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.result.json
@@ -15,7 +15,7 @@
     }
   ],
   "broadcast_rpc_address": "__NODE_PRIVATE_ADDRESS__",
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/functional.result.json b/unit_tests/test_data/test_scylla_yaml_builders/functional.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/jepsen.result.json b/unit_tests/test_data/test_scylla_yaml_builders/jepsen.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/longevity-10gb-3h.result.json b/unit_tests/test_data/test_scylla_yaml_builders/longevity-10gb-3h.result.json
@@ -15,7 +15,7 @@
     }
   ],
   "broadcast_rpc_address": "__NODE_IPV6_ADDRESS__",
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "__NODE_IPV6_ADDRESS__",
   "enable_ipv6_dns_lookup": true,
   "alternator_enforce_authorization": false,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/manager-backup-1TB-gce.result.json b/unit_tests/test_data/test_scylla_yaml_builders/manager-backup-1TB-gce.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/...tests/test_data/test_scylla_yaml_builders/perf-regression.100threads.30M-keys.result.json b/...tests/test_data/test_scylla_yaml_builders/perf-regression.100threads.30M-keys.result.json
@@ -13,7 +13,7 @@
       ]
     }
   ],
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
   "auto_bootstrap": true,

diff --git a/unit_tests/test_data/test_scylla_yaml_builders/rolling-upgrade.result.json b/unit_tests/test_data/test_scylla_yaml_builders/rolling-upgrade.result.json
@@ -20,7 +20,7 @@
     "keyfile": "/etc/scylla/ssl_conf/db.key",
     "truststore": "/etc/scylla/ssl_conf/cadb.pem"
   },
-  "experimental_features": ["alternator-streams", "alternator-ttl", "keyspace-storage-options"],
+  "experimental_features": [],
   "saslauthd_socket_path": "/run/saslauthd/mux",
   "prometheus_address": "0.0.0.0",
   "alternator_enforce_authorization": false,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,5 +24,3 @@ user_prefix: 'longevity-cdc-100gb-4h'
		space_node_threshold: 64424

		server_encrypt: true

		experimental_features: []