improvement(aws): Use newer instance types of mostly the same cost

Fixes: #7191 Signed-off-by: Yaniv Kaul <yaniv.kaul@scylladb.com>
scylladb · Feb 21, 2024 · 4103add · 4103add
1 parent dbb58dc
commit 4103add
Show file tree

Hide file tree

Showing 50 changed files with 63 additions and 63 deletions.
diff --git a/configurations/operator/perf-serverless-thrpt-1vcpu.yaml b/configurations/operator/perf-serverless-thrpt-1vcpu.yaml
@@ -6,7 +6,7 @@ user_prefix: "perf-thrpt-1vcpu"
 
 n_loaders: 1
 stress_multiplier: 1
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 round_robin: true
 # https://github.com/scylladb/scylla-cluster-tests/issues/5883
 use_hdr_cs_histogram: false

diff --git a/configurations/operator/perf-serverless-thrpt-2vcpu.yaml b/configurations/operator/perf-serverless-thrpt-2vcpu.yaml
@@ -6,7 +6,7 @@ user_prefix: "perf-thrpt-2vcpus"
 
 n_loaders: 1
 stress_multiplier: 1
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 round_robin: true
 # https://github.com/scylladb/scylla-cluster-tests/issues/5883
 use_hdr_cs_histogram: false

diff --git a/defaults/aws_config.yaml b/defaults/aws_config.yaml
@@ -4,7 +4,7 @@ instance_provision_fallback_on_demand: false
 region_name:
   - eu-west-1
 user_credentials_path: '~/.ssh/scylla-qa-ec2'
-instance_type_loader: 'c5.xlarge'
+instance_type_loader: 'c6i.xlarge'
 instance_type_monitor: 't3.large'
 # manual on creating loader AMI's: see docs/new_loader_ami.md
 ami_id_loader: 'scylla-qa-loader-ami-v19'

diff --git a/defaults/k8s_local_kind_aws_config.yaml b/defaults/k8s_local_kind_aws_config.yaml
@@ -1,2 +1,2 @@
-instance_type_runner: c5.2xlarge
+instance_type_runner: c6i.2xlarge
 root_disk_size_runner: 140
diff --git a/internal_test_data/multi_region_dc_test_case.yaml b/internal_test_data/multi_region_dc_test_case.yaml
@@ -9,8 +9,8 @@ space_node_threshold: 6442
 
 ami_id_db_scylla_desc: VERSION
 
-instance_type_loader: 'c5.large'
-instance_type_monitor: 't2.small'
+instance_type_loader: 'c6i.large'
+instance_type_monitor: 't3.small'
 
 db_type: scylla
 instance_type_db: 'i4i.large'
diff --git a/performance_regression_gradual_grow_throughput.py b/performance_regression_gradual_grow_throughput.py
@@ -29,7 +29,7 @@ def __init__(self, *args, **kwargs):
                              self.REPLICATION_FACTOR)
         # How many standard deviations should span the cluster's memory
         self.CONFIDENCE = 6  # pylint: disable=invalid-name
-        # intance i3.4xlarge
+        # instance i3.4xlarge
         self.INSTANCE_MEMORY_GB = 122  # pylint: disable=invalid-name
         self.GAUSS_CENTER = self.ROW_COUNT // 2  # pylint: disable=invalid-name
         self.GAUSS_SIGMA = int(self.INSTANCE_MEMORY_GB * self.CLUSTER_SIZE * 1024 * 1024 *  # pylint: disable=invalid-name

diff --git a/sdcm/cluster_aws.py b/sdcm/cluster_aws.py
@@ -79,7 +79,7 @@ class AWSCluster(cluster.BaseCluster):  # pylint: disable=too-many-instance-attr
 
     def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint: disable=too-many-arguments
                  services, credentials, cluster_uuid=None,
-                 ec2_instance_type='c5.xlarge', ec2_ami_username='root',
+                 ec2_instance_type='c6i.xlarge', ec2_ami_username='root',
                  ec2_user_data='', ec2_block_device_mappings=None,
                  cluster_prefix='cluster',
                  node_prefix='node', n_nodes=10, params=None, node_type=None,
@@ -826,7 +826,7 @@ def ena_support(self) -> bool:
 class ScyllaAWSCluster(cluster.BaseScyllaCluster, AWSCluster):
 
     def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint: disable=too-many-arguments
-                 services, credentials, ec2_instance_type='c5.xlarge',
+                 services, credentials, ec2_instance_type='c6i.xlarge',
                  ec2_ami_username='centos',
                  ec2_block_device_mappings=None,
                  user_prefix=None,
@@ -908,7 +908,7 @@ def destroy(self):
 class CassandraAWSCluster(ScyllaAWSCluster):
 
     def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint: disable=too-many-arguments
-                 services, credentials, ec2_instance_type='c5.xlarge',
+                 services, credentials, ec2_instance_type='c6i.xlarge',
                  ec2_ami_username='ubuntu',
                  ec2_block_device_mappings=None,
                  user_prefix=None,
@@ -1000,7 +1000,7 @@ def wait_for_init(self, node_list=None, verbose=False, timeout=None, check_node_
 class LoaderSetAWS(cluster.BaseLoaderSet, AWSCluster):
 
     def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint: disable=too-many-arguments
-                 services, credentials, ec2_instance_type='c5.xlarge',
+                 services, credentials, ec2_instance_type='c6i.xlarge',
                  ec2_block_device_mappings=None,
                  ec2_ami_username='centos',
                  user_prefix=None, n_nodes=10, params=None):
@@ -1033,7 +1033,7 @@ def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint:
 class MonitorSetAWS(cluster.BaseMonitorSet, AWSCluster):
 
     def __init__(self, ec2_ami_id, ec2_subnet_id, ec2_security_group_ids,  # pylint: disable=too-many-arguments
-                 services, credentials, ec2_instance_type='c5.xlarge',
+                 services, credentials, ec2_instance_type='c6i.xlarge',
                  ec2_block_device_mappings=None,
                  ec2_ami_username='centos',
                  user_prefix=None, n_nodes=10, targets=None, params=None,

diff --git a/templates/test_config/template-longevity-5gb-1h-base.yaml.j2 b/templates/test_config/template-longevity-5gb-1h-base.yaml.j2
@@ -19,7 +19,7 @@ instance_type_db: 'i4i.large'
 gce_instance_type_db: 'n1-highmem-2'
 gce_instance_type_loader: 'e2-standard-2'
 azure_instance_type_db: 'Standard_L8s_v3'
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 azure_instance_type_loader: 'Standard_F2s_v2'
 
 nemesis_interval: 3

diff --git a/test-cases/PR-provision-test-docker.yaml b/test-cases/PR-provision-test-docker.yaml
@@ -7,7 +7,7 @@ n_loaders: 1
 n_monitor_nodes: 1
 n_db_nodes: 1
 
-instance_type_runner: c5.2xlarge
+instance_type_runner: c6i.2xlarge
 
 nemesis_class_name: NonDisruptiveMonkey
 nemesis_interval: 1

diff --git a/test-cases/artifacts/oel76.yaml b/test-cases/artifacts/oel76.yaml
@@ -3,7 +3,7 @@ ami_id_db_scylla: 'ami-0d6a24fe35fdf5dc4'
 root_disk_size_db: 50
 backtrace_decoding: false
 cluster_backend: 'aws'
-instance_type_db: 'i3.large'
+instance_type_db: 'i4i.large'
 instance_provision: "spot"
 instance_provision_fallback_on_demand: true
 logs_transport: 'ssh'

diff --git a/test-cases/artifacts/oel81.yaml b/test-cases/artifacts/oel81.yaml
@@ -3,7 +3,7 @@ ami_id_db_scylla: 'ami-0e883e67243efea62'
 root_disk_size_db: 50
 backtrace_decoding: false
 cluster_backend: 'aws'
-instance_type_db: 'i3.large'
+instance_type_db: 'i4i.large'
 instance_provision: "spot"
 instance_provision_fallback_on_demand: true
 logs_transport: 'ssh'

diff --git a/test-cases/artifacts/ubuntu2004-fips.yaml b/test-cases/artifacts/ubuntu2004-fips.yaml
@@ -2,7 +2,7 @@ ami_id_db_scylla: 'ubuntu-pro-fips-server/images/hvm-ssd/ubuntu-focal-20.04-amd6
 root_disk_size_db: 50
 backtrace_decoding: false
 cluster_backend: 'aws'
-instance_type_db: 'i3.large'
+instance_type_db: 'i4i.large'
 instance_provision: "spot"
 instance_provision_fallback_on_demand: true
 logs_transport: 'ssh'

diff --git a/test-cases/cdc/cdc-15m-replication-gemini.yaml b/test-cases/cdc/cdc-15m-replication-gemini.yaml
@@ -10,7 +10,7 @@ n_test_oracle_db_nodes: 1
 instance_type_db_oracle: 'i3.large'
 
 n_loaders: 1
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 n_monitor_nodes: 0
 # instance_type_monitor: 't3.small'

diff --git a/test-cases/cdc/cdc-15m-replication-postimage.yaml b/test-cases/cdc/cdc-15m-replication-postimage.yaml
@@ -10,7 +10,7 @@ n_test_oracle_db_nodes: 1
 instance_type_db_oracle: 'i3.large'
 
 n_loaders: 1
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 n_monitor_nodes: 0
 # instance_type_monitor: 't3.small'

diff --git a/test-cases/cdc/cdc-15m-replication-preimage.yaml b/test-cases/cdc/cdc-15m-replication-preimage.yaml
@@ -10,7 +10,7 @@ n_test_oracle_db_nodes: 1
 instance_type_db_oracle: 'i3.large'
 
 n_loaders: 1
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 n_monitor_nodes: 0
 # instance_type_monitor: 't3.small'

diff --git a/test-cases/cdc/cdc-15m-replication.yaml b/test-cases/cdc/cdc-15m-replication.yaml
@@ -10,7 +10,7 @@ n_test_oracle_db_nodes: 1
 instance_type_db_oracle: 'i3.large'
 
 n_loaders: 1
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 n_monitor_nodes: 0
 # instance_type_monitor: 't3.small'

diff --git a/test-cases/cdc/cdc-replication-longevity.yaml b/test-cases/cdc/cdc-replication-longevity.yaml
@@ -10,7 +10,7 @@ n_test_oracle_db_nodes: 1
 instance_type_db_oracle: 'i3.large'
 
 n_loaders: 1
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 n_monitor_nodes: 1
 

diff --git a/test-cases/features/2mv-backpressure-4d.yaml b/test-cases/features/2mv-backpressure-4d.yaml
@@ -10,7 +10,7 @@ n_monitor_nodes: 1
 user_prefix: 'longevity-2mv-backpressure-4d'
 
 instance_type_db: 'i4i.2xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 nemesis_class_name: 'ChaosMonkey'
 nemesis_during_prepare: false
diff --git a/test-cases/features/dns-cluster-5min.yaml b/test-cases/features/dns-cluster-5min.yaml
@@ -9,6 +9,6 @@ n_loaders: 1
 n_monitor_nodes: 1
 
 instance_type_db: 'i4i.2xlarge'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 
 user_prefix: 'cases-dns'
diff --git a/test-cases/features/enospc-30mins.yaml b/test-cases/features/enospc-30mins.yaml
@@ -8,7 +8,7 @@ n_loaders: 4
 n_monitor_nodes: 1
 
 instance_type_db: 'c3.large' # for cassandra we'll use 'm3.large'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 instance_type_monitor: 't3.small'
 
 user_prefix: 'cases-enospc'

diff --git a/test-cases/features/limit-streaming-io.yaml b/test-cases/features/limit-streaming-io.yaml
@@ -19,7 +19,7 @@ nemesis_add_node_cnt: 3
 n_loaders: 4
 n_monitor_nodes: 1
 
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 instance_type_monitor: 't3.large'
 instance_type_db: 'i4i.2xlarge'
 

diff --git a/test-cases/gemini/gemini-1tb-10h.yaml b/test-cases/gemini/gemini-1tb-10h.yaml
@@ -4,7 +4,7 @@ n_test_oracle_db_nodes: 1
 n_loaders: 1
 n_monitor_nodes: 1
 instance_type_db: 'i4i.4xlarge'
-instance_type_loader: 'm5.xlarge'
+instance_type_loader: 'm6i.xlarge'
 
 user_prefix: 'gemini-1tb-10h'
 

diff --git a/test-cases/gemini/gemini-8h-large-num-columns.yaml b/test-cases/gemini/gemini-8h-large-num-columns.yaml
@@ -4,7 +4,7 @@ n_test_oracle_db_nodes: 1
 n_loaders: 1
 n_monitor_nodes: 1
 instance_type_db: 'i3en.3xlarge'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 
 user_prefix: 'gemini-8h-large-num-columns'
 

diff --git a/test-cases/longevity/longevity-1TB-3days-authorization-and-tls-ssl.yaml b/test-cases/longevity/longevity-1TB-3days-authorization-and-tls-ssl.yaml
@@ -19,7 +19,7 @@ seeds_num: 3
 
 instance_type_db: 'i4i.2xlarge'
 
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 nemesis_class_name: 'SisyphusMonkey'
 nemesis_seed: '555'

diff --git a/test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml b/test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml
@@ -23,7 +23,7 @@ gce_n_local_ssd_disk_db: 16
 azure_instance_type_db: 'Standard_L16s_v3'
 root_disk_size_runner: 120
 
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 gce_instance_type_loader: 'c2-standard-16'
 
 

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
@@ -25,8 +25,8 @@ n_loaders: 4
 n_monitor_nodes: 1
 
 instance_type_db: 'i3en.3xlarge'
-instance_type_loader: 'c5.2xlarge'
-instance_type_runner: 'r5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
+instance_type_runner: 'r6i.2xlarge'
 
 cluster_health_check: false
 nemesis_class_name: 'DisruptiveMonkey:1 NonDisruptiveMonkey:2'

diff --git a/test-cases/longevity/longevity-50GB-3days-authorization-and-tls-ssl.yaml b/test-cases/longevity/longevity-50GB-3days-authorization-and-tls-ssl.yaml
@@ -14,7 +14,7 @@ n_monitor_nodes: 1
 
 instance_type_db: 'i4i.4xlarge'
 # Seems the c5.xlarge type is small for this load - I receive OOM on 2 loaders
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 nemesis_class_name: 'SisyphusMonkey'
 nemesis_seed: '027'

diff --git a/test-cases/longevity/longevity-5TB-1day.yaml b/test-cases/longevity/longevity-5TB-1day.yaml
@@ -25,7 +25,7 @@ gce_instance_type_db: 'n2-highmem-32'
 gce_n_local_ssd_disk_db: 24
 azure_instance_type_db: 'Standard_L16s_v3'
 
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 gce_instance_type_loader: 'c2-standard-16'
 
 

diff --git a/test-cases/longevity/longevity-alternator-streams-100gb-12h.yaml b/test-cases/longevity/longevity-alternator-streams-100gb-12h.yaml
@@ -39,7 +39,7 @@ n_db_nodes: 6
 n_monitor_nodes: 1
 
 instance_type_db: 'i4i.4xlarge'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 
 nemesis_class_name: 'NoOpMonkey'
 nemesis_interval: 5

diff --git a/test-cases/longevity/longevity-encryption-at-rest-50GB-1day-authorization-and-tls-ssl.yaml b/test-cases/longevity/longevity-encryption-at-rest-50GB-1day-authorization-and-tls-ssl.yaml
@@ -12,7 +12,7 @@ n_loaders: 3
 n_monitor_nodes: 1
 
 instance_type_db: 'i4i.4xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 nemesis_class_name: 'SisyphusMonkey'
 nemesis_seed: '111'

diff --git a/test-cases/longevity/longevity-lwt-500G-3d.yaml b/test-cases/longevity/longevity-lwt-500G-3d.yaml
@@ -20,7 +20,7 @@ n_monitor_nodes: 1
 round_robin: true
 
 instance_type_db: 'i4i.4xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 nemesis_class_name: 'SisyphusMonkey'
 nemesis_seed: '019'

diff --git a/test-cases/longevity/longevity-multi-keyspaces.yaml b/test-cases/longevity/longevity-multi-keyspaces.yaml
@@ -25,7 +25,7 @@ gce_instance_type_db: 'n2-highmem-64'
 gce_n_local_ssd_disk_db: 16
 
 root_disk_size_db: 60 # twice as as default, cause each keyspace generate lots of logs
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 root_disk_size_monitor: 100
 root_disk_size_runner: 120
 

diff --git a/test-cases/longevity/longevity-ndbench-12-nodes-multidc-4h.yaml b/test-cases/longevity/longevity-ndbench-12-nodes-multidc-4h.yaml
@@ -16,7 +16,7 @@ n_loaders: '2 2'
 n_monitor_nodes: 1
 
 instance_type_db: 'i4i.xlarge'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 
 user_prefix: 'longevity-ndbench-multi-dc'
 space_node_threshold: 64424

diff --git a/test-cases/longevity/longevity-ndbench-192-nodes-multidc-4h.yaml b/test-cases/longevity/longevity-ndbench-192-nodes-multidc-4h.yaml
@@ -16,7 +16,7 @@ n_loaders: '32 32'
 n_monitor_nodes: 1
 
 instance_type_db: 'i4i.xlarge'
-instance_type_loader: 'c5.4xlarge'
+instance_type_loader: 'c6i.4xlarge'
 
 user_prefix: 'longevity-ndbench-multi-dc'
 space_node_threshold: 64424

diff --git a/test-cases/longevity/longevity-sla-100gb-4h.yaml b/test-cases/longevity/longevity-sla-100gb-4h.yaml
@@ -20,7 +20,7 @@ round_robin: true
 sla: true
 
 instance_type_db: 'i3.2xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 run_fullscan: ['{"mode": "table_and_aggregate", "ks_cf": "keyspace1.standard1", "interval": 5}']
 nemesis_class_name: 'SlaNemeses'

diff --git a/test-cases/manager/manager-regression-ipv6.yaml b/test-cases/manager/manager-regression-ipv6.yaml
@@ -3,7 +3,7 @@ test_duration: 120
 stress_cmd: "cassandra-stress write cl=QUORUM n=4000000 -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=3) compaction(strategy=SizeTieredCompactionStrategy)' -mode cql3 native -rate threads=200 -pop seq=400000000..600000000"
 
 instance_type_db: 'i4i.large'
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 region_name: 'eu-west-1'
 n_db_nodes: 3

diff --git a/test-cases/manager/manager-regression-multiDC-set-distro.yaml b/test-cases/manager/manager-regression-multiDC-set-distro.yaml
@@ -4,7 +4,7 @@ stress_cmd: "cassandra-stress write cl=QUORUM n=4000000 -schema 'replication(str
 stress_read_cmd: "cassandra-stress read cl=QUORUM n=4000000 -schema 'replication(strategy=NetworkTopologyStrategy,us-eastscylla_node_east=2,us-west-2scylla_node_west=1)' -mode cql3 native -rate threads=200 -pop seq=400000000..600000000"
 
 instance_type_db: 'i4i.large'
-instance_type_loader: 'c5.large'
+instance_type_loader: 'c6i.large'
 
 region_name: 'us-east-1 us-west-2'
 n_db_nodes: '2 1'

diff --git a/test-cases/manager/manager-repair-control.yaml b/test-cases/manager/manager-repair-control.yaml
@@ -12,7 +12,7 @@ round_robin: true
 hinted_handoff: 'disabled'  # Turned off so it would not interfere with the creation of missing rows and with the repair
 
 instance_type_db: 'i4i.2xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 n_db_nodes: 9
 n_loaders: 4

diff --git a/test-cases/manager/manager-repair-intensity-multiple-repaired-nodes.yaml b/test-cases/manager/manager-repair-intensity-multiple-repaired-nodes.yaml
@@ -12,7 +12,7 @@ round_robin: true
 hinted_handoff: 'disabled'  # Turned off so it would not interfere with the creation of missing rows and with the repair
 
 instance_type_db: 'i4i.2xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 n_db_nodes: 9
 n_loaders: 4

diff --git a/test-cases/manager/manager-repair-intensity-single-repaired-nodes.yaml b/test-cases/manager/manager-repair-intensity-single-repaired-nodes.yaml
@@ -12,7 +12,7 @@ round_robin: true
 hinted_handoff: 'disabled'  # Turned off so it would not interfere with the creation of missing rows and with the repair
 
 instance_type_db: 'i4i.2xlarge'
-instance_type_loader: 'c5.2xlarge'
+instance_type_loader: 'c6i.2xlarge'
 
 n_db_nodes: 6
 n_loaders: 4