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

fix(tablets): remove tablets from experimental features #7512

Closed
wants to merge 1 commit into from
Closed

fix(tablets): remove tablets from experimental features #7512

Show file tree
Hide file tree
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
3 changes: 0 additions & 3 deletions configurations/raft/enable_raft_experimental.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions configurations/rolling-upgrade-with-tablets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ stress_after_cluster_upgrade: cassandra-stress read no-warmup cl=QUORUM n=302004


n_db_nodes: 4

enable_tablets_on_upgrade: true
3 changes: 0 additions & 3 deletions configurations/tablets-initial-32.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
append_scylla_yaml: |
experimental_features:
- tablets
- consistent-topology-changes
tablets_initial_scale_factor: 4
4 changes: 0 additions & 4 deletions configurations/tablets.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion defaults/test_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ scylla_version: ''
test_upgrade_from_installed_3_1_0: false
target_upgrade_version: ''
disable_raft: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still true? Do we disable raft by default?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC this flag is not relevant anymore, unless still relevant to only 1 out of 2 raft features. @aleksbykov , @roydahan , can you please confirm?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not.
@aleksbykov / @temichus ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This flag is only was used for rolling upgrade tests. Job with disabled raft uses additional yaml with relevant

enable_tablets_on_upgrade: false

stress_cdclog_reader_cmd: "cdc-stressor -stream-query-round-duration 30s"

Expand Down
1 change: 0 additions & 1 deletion docs/configuration_options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@
| **<a href="#user-content-new_version" name="new_version">new_version</a>** | Assign new upgrade version, use it to upgrade to specific minor release. eg: 3.0.1 | N/A | SCT_NEW_VERSION
| **<a href="#user-content-target_upgrade_version" name="target_upgrade_version">target_upgrade_version</a>** | Assign target upgrade version, use for decide if the truncate entries test should be run. This test should be performed in case the target upgrade version >= 3.1 | N/A | SCT_TARGET_UPGRADE_VERSION
| **<a href="#user-content-disable_raft" name="disable_raft">disable_raft</a>** | As for now, raft will be enable by default in all [upgrade] tests, so this flag will allow usto still run [upgrade] test without raft enabled (or disabling raft), so we will have bettercoverage | True | SCT_DISABLE_RAFT
| **<a href="#user-content-enable_tablets_on_upgrade" name="enable_tablets_on_upgrade">enable_tablets_on_upgrade</a>** | By default, the tablets feature is disabled. With this parameter, created for the upgrade test,the tablets feature will only be enabled after the upgrade | N/A | SCT_ENABLE_TABLETS_ON_UPGRADE
| **<a href="#user-content-upgrade_node_packages" name="upgrade_node_packages">upgrade_node_packages</a>** | | N/A | SCT_UPGRADE_NODE_PACKAGES
| **<a href="#user-content-test_sst3" name="test_sst3">test_sst3</a>** | | N/A | SCT_TEST_SST3
| **<a href="#user-content-test_upgrade_from_installed_3_1_0" name="test_upgrade_from_installed_3_1_0">test_upgrade_from_installed_3_1_0</a>** | Enable an option for installed 3.1.0 for work around a scylla issue if it's true | N/A | SCT_TEST_UPGRADE_FROM_INSTALLED_3_1_0
Expand Down
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/gemini-8h-large-num-columns.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'gemini_test.GeminiTest.test_load_random_with_nemesis',
test_config: '''["test-cases/gemini/gemini-8h-large-num-columns.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/gemini/gemini-8h-large-num-columns.yaml"]''',

timeout: [time: 540, unit: 'MINUTES'],
email_recipients: '[email protected]'
Expand Down
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-100gb-4h-with-raft.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-150gb-asymmetric-cluster-12h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml"]'''
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-1tb-7days.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml"]'''

)
2 changes: 1 addition & 1 deletion ...nes/oss/raft/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-5000-tables.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_user_batch_custom_time',
test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/scale/longevity-5000-tables.yaml"]''',

timeout: [time: 4440, unit: 'MINUTES'],
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-50gb-asymmetric-cluster-12h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml"]'''
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-alternator-200gb-48h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-alternator-200GB-48h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/longevity/longevity-alternator-200GB-48h.yaml"]''',

email_recipients: '[email protected]'
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-cdc-3d-400gb.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-cdc-3d-400gb.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-cdc-3d-400gb.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-cdc-8h-multi-dc-topology-changes-raft.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: '''["eu-west-1", "us-east-1"]''',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-cdc-100gb-8h-multi-dc-topology-changes.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-cdc-100gb-8h-multi-dc-topology-changes.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-counters-6h-multidc.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: '''["eu-west-1", "us-west-2", "us-east-1"]''',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-counters-multidc.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-counters-multidc.yaml"]'''

)
2 changes: 1 addition & 1 deletion ...ins-pipelines/oss/raft/longevity-double-cluster-with-schema-changes-with-raft.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-change-cluster-size-by-2-times.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/longevity/longevity-change-cluster-size-by-2-times.yaml"]''',

timeout: [time: 820, unit: 'MINUTES']
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-large-collections-12h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-large-collections-12h.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-large-collections-12h.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-large-partition-200k-pks-4days.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity',
test_config: '''["test-cases/longevity/longevity-large-partition-200k_pks-4days.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-large-partition-200k_pks-4days.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-large-partition-4days.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity',
test_config: '''["test-cases/longevity/longevity-large-partition-4days.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-large-partition-4days.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-large-partition-8h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity',
test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity',
test_config: '''["test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-lwt-24h-multidc.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: '''["eu-west-1", "us-west-2", "us-east-1"]''',
test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity',
test_config: '''["test-cases/longevity/longevity-lwt-24h-multidc.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-lwt-24h-multidc.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-lwt-500G-3d.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity',
test_config: '''["test-cases/longevity/longevity-lwt-500G-3d.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-lwt-500G-3d.yaml"]'''

)
2 changes: 1 addition & 1 deletion ...lines/oss/raft/longevity-lwt-parallel-schema-changes-with-disruptive-24h-raft.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity',
test_config: '''["test-cases/longevity/longevity-lwt-parallel-24h.yaml", "configurations/raft/enable_raft_experimental.yaml"]'''
test_config: '''["test-cases/longevity/longevity-lwt-parallel-24h.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/longevity-schema-changes-3h-with-raft.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-schema-changes-3h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/longevity/longevity-schema-changes-3h.yaml"]''',

timeout: [time: 360, unit: 'MINUTES']
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/raft/scale-40-60-cluster-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ longevityPipeline(
region: 'eu-west-1',
post_behavior_db_nodes: 'destroy',
test_name: 'grow_cluster_test.GrowClusterTest.test_grow_x_to_y',
test_config: '''["test-cases/scale/scale-cluster.yaml", "configurations/scale/scale-40-60.yaml", "configurations/raft/enable_raft_experimental.yaml"]''',
test_config: '''["test-cases/scale/scale-cluster.yaml", "configurations/scale/scale-40-60.yaml"]''',

timeout: [time: 12240, unit: 'MINUTES']
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/longevity-100gb-4h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ longevityPipeline(
region: 'eu-west-1',
availability_zone: 'c',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''',
test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/tablets_supported_nemeses.yaml"]''',
instance_provision_fallback_on_demand: true
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/longevity-harry-2h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_custom_time',
test_config: '''["test-cases/longevity/longevity-harry-2h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
test_config: '''["test-cases/longevity/longevity-harry-2h.yaml", "configurations/tablets_supported_nemeses.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/longevity-large-partition-8h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity',
test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/tablets_supported_nemeses.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/longevity-multi-keyspaces-60h.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_batch_custom_time',
test_config: '''["test-cases/longevity/longevity-multi-keyspaces.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
test_config: '''["test-cases/longevity/longevity-multi-keyspaces.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/longevity-multidc-multirack.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ longevityPipeline(
backend: 'aws',
region: '''["eu-west-1", "eu-west-2"]''',
test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity',
test_config: '''["test-cases/longevity/longevity-multi-dc-rack-aware.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml", "configurations/tablets_multidc_multirack.yaml"]'''
test_config: '''["test-cases/longevity/longevity-multi-dc-rack-aware.yaml", "configurations/tablets_supported_nemeses.yaml", "configurations/tablets_multidc_multirack.yaml"]'''

)
2 changes: 1 addition & 1 deletion jenkins-pipelines/oss/tablets/scale-5000-tables.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ longevityPipeline(
backend: 'aws',
region: 'eu-west-1',
test_name: 'longevity_test.LongevityTest.test_user_batch_custom_time',
test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/tablets_supported_nemeses.yaml"]'''
)
4 changes: 2 additions & 2 deletions sct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,10 +1686,10 @@ def configure_jenkins_builders(cloud_provider, regions):
def get_nemesis_list(backend, config):
"""
# usage via command line:
hydra nemesis-list -c test-cases/longevity/longevity-cdc-100gb-4h.yaml -c configurations/tablets.yaml
hydra nemesis-list -c test-cases/longevity/longevity-cdc-100gb-4h.yaml

# usage with environment variables
export SCT_CONFIG_FILES='["test-cases/longevity/longevity-cdc-100gb-4h.yaml", "configurations/tablets.yaml"]'
export SCT_CONFIG_FILES='["test-cases/longevity/longevity-cdc-100gb-4h.yaml"]'
hydra nemesis-list

"""
Expand Down
4 changes: 0 additions & 4 deletions sdcm/sct_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,10 +1173,6 @@ class SCTConfiguration(dict):
"to still run [upgrade] test without raft enabled (or disabling raft), so we will have better"
"coverage"),

dict(name="enable_tablets_on_upgrade", env="SCT_ENABLE_TABLETS_ON_UPGRADE", type=boolean,
help="By default, the tablets feature is disabled. With this parameter, created for the upgrade test,"
"the tablets feature will only be enabled after the upgrade"),

dict(name="upgrade_node_packages", env="SCT_UPGRADE_NODE_PACKAGES", type=str,
help=""),

Expand Down
12 changes: 0 additions & 12 deletions upgrade_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,6 @@ def _upgrade_node(self, node, upgrade_sstables=True, new_scylla_repo=None, new_v
if not self.params.get('disable_raft'):
scylla_yaml_updates.update({"consistent_cluster_management": True})

if self.params.get("enable_tablets_on_upgrade"):
scylla_yaml_updates.update({"experimental_features": ["tablets", "consistent-topology-changes"]})

if self.params.get('test_sst3'):
scylla_yaml_updates.update({"enable_sstables_mc_format": True})

Expand Down Expand Up @@ -371,15 +368,6 @@ def _rollback_node(self, node, upgrade_sstables=True):
node.run_nodetool("snapshot")
node.stop_scylla_server(verify_down=False)

if self.params.get("enable_tablets_on_upgrade"):
with node.remote_scylla_yaml() as scylla_yml:
current_experimental_features = scylla_yml.experimental_features
current_experimental_features.remove("tablets")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we instead edit scylla.yaml to remove the newly introduced enable_tablets config option?
(See scylladb/scylladb#18898)

current_experimental_features.remove("consistent-topology-changes")
if len(current_experimental_features) == 0:
current_experimental_features = None
scylla_yml.experimental_features = current_experimental_features

if node.distro.is_rhel_like:
node.remoter.run('sudo cp ~/scylla.repo-backup /etc/yum.repos.d/scylla.repo')
node.remoter.run('sudo chown root.root /etc/yum.repos.d/scylla.repo')
Expand Down