diff --git a/CHANGELOG.md b/CHANGELOG.md index 339f407e60..1c2a39ff70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ CHANGELOG - Set instance ID and instance type information in Slurm upon compute nodes launch. - Install NVIDIA drivers without the option 'no-cc-version-check', which is now deprecated in the NVIDIA installer. - Add validator to enforce up to 10- login node pools. +- Update the default root volume size to 45 GB. **BUG FIXES** - Remove usage of cfn-init for compute node bootstrapping to reduce node scale up time. diff --git a/cli/src/pcluster/constants.py b/cli/src/pcluster/constants.py index a1036f7f6a..aaf72cb06d 100644 --- a/cli/src/pcluster/constants.py +++ b/cli/src/pcluster/constants.py @@ -125,7 +125,7 @@ "io2": 100, "gp3": 3000, } -EBS_VOLUME_SIZE_DEFAULT = 40 +EBS_VOLUME_SIZE_DEFAULT = 45 EBS_VOLUME_TYPE_DEFAULT = "gp3" DEFAULT_MAX_COUNT = 10 diff --git a/cli/src/pcluster/imagebuilder_utils.py b/cli/src/pcluster/imagebuilder_utils.py index 98a3a250f8..2ece6b61fc 100644 --- a/cli/src/pcluster/imagebuilder_utils.py +++ b/cli/src/pcluster/imagebuilder_utils.py @@ -16,7 +16,7 @@ from pcluster.utils import get_url_scheme, yaml_load ROOT_VOLUME_TYPE = "gp3" -PCLUSTER_RESERVED_VOLUME_SIZE = 32 +PCLUSTER_RESERVED_VOLUME_SIZE = 37 AMI_NAME_REQUIRED_SUBSTRING = " {{ imagebuilder:buildDate }}" diff --git a/cli/tests/pcluster/example_configs/awsbatch.full.yaml b/cli/tests/pcluster/example_configs/awsbatch.full.yaml index 001a809650..fe91e5f21b 100644 --- a/cli/tests/pcluster/example_configs/awsbatch.full.yaml +++ b/cli/tests/pcluster/example_configs/awsbatch.full.yaml @@ -31,7 +31,7 @@ HeadNode: AllowedIps: 1.2.3.4/32 LocalStorage: RootVolume: - Size: 37 + Size: 45 Encrypted: true DeleteOnTermination: true EphemeralVolume: diff --git a/cli/tests/pcluster/example_configs/slurm.full.yaml b/cli/tests/pcluster/example_configs/slurm.full.yaml index ee368ef1f5..55b50a3d7e 100644 --- a/cli/tests/pcluster/example_configs/slurm.full.yaml +++ b/cli/tests/pcluster/example_configs/slurm.full.yaml @@ -68,7 +68,7 @@ HeadNode: AllowedIps: 1.2.3.4/32 LocalStorage: RootVolume: - Size: 40 + Size: 45 Encrypted: true VolumeType: gp2 Iops: 100 diff --git a/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full.all_resources.yaml b/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full.all_resources.yaml index b0958407e5..2487d95d9d 100644 --- a/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full.all_resources.yaml +++ b/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full.all_resources.yaml @@ -65,7 +65,7 @@ HeadNode: AllowedIps: 1.2.3.4/32 LocalStorage: RootVolume: - Size: 40 + Size: 45 Encrypted: true VolumeType: gp2 Iops: 100 diff --git a/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full_config.snapshot.yaml b/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full_config.snapshot.yaml index f0e726fe4f..eddb82b155 100644 --- a/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full_config.snapshot.yaml +++ b/cli/tests/pcluster/templates/test_cluster_stack/test_cluster_config_limits/slurm.full_config.snapshot.yaml @@ -50,7 +50,7 @@ HeadNode: DeleteOnTermination: true Encrypted: true Iops: 100 - Size: 40 + Size: 45 Throughput: null VolumeType: gp2 Networking: diff --git a/cli/tests/pcluster/templates/test_imagebuilder_stack.py b/cli/tests/pcluster/templates/test_imagebuilder_stack.py index 17f8e9d3c6..215f0fa235 100644 --- a/cli/tests/pcluster/templates/test_imagebuilder_stack.py +++ b/cli/tests/pcluster/templates/test_imagebuilder_stack.py @@ -3317,7 +3317,7 @@ def test_imagebuilder_distribution_configuraton(mocker, resource, response, expe } ], }, - {"Encrypted": False, "VolumeSize": 40, "VolumeType": "gp3"}, + {"Encrypted": False, "VolumeSize": 45, "VolumeType": "gp3"}, ), ( { @@ -3350,7 +3350,7 @@ def test_imagebuilder_distribution_configuraton(mocker, resource, response, expe { "imagebuilder": { "image": { - "root_volume": {"size": 40, "encrypted": True}, + "root_volume": {"size": 45, "encrypted": True}, }, "build": { "parent_image": "arn:aws:imagebuilder:us-east-1:aws:image/amazon-linux-2-x86/x.x.x", @@ -3369,7 +3369,7 @@ def test_imagebuilder_distribution_configuraton(mocker, resource, response, expe } ], }, - {"Encrypted": True, "VolumeSize": 40, "VolumeType": "gp3"}, + {"Encrypted": True, "VolumeSize": 45, "VolumeType": "gp3"}, ), ( { @@ -3399,7 +3399,7 @@ def test_imagebuilder_distribution_configuraton(mocker, resource, response, expe }, { "Encrypted": True, - "VolumeSize": 82, + "VolumeSize": 87, "VolumeType": "gp3", "KmsKeyId": "arn:aws:kms:us-east-1:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab", }, diff --git a/cli/tests/pcluster/validators/test_all_validators/test_slurm_all_validators_are_called/slurm_1.yaml b/cli/tests/pcluster/validators/test_all_validators/test_slurm_all_validators_are_called/slurm_1.yaml index 292f064484..4c1a179595 100644 --- a/cli/tests/pcluster/validators/test_all_validators/test_slurm_all_validators_are_called/slurm_1.yaml +++ b/cli/tests/pcluster/validators/test_all_validators/test_slurm_all_validators_are_called/slurm_1.yaml @@ -17,7 +17,7 @@ HeadNode: AllowedIps: 1.2.3.4/32 LocalStorage: RootVolume: - Size: 40 + Size: 45 Encrypted: true EphemeralVolume: MountDir: /test diff --git a/cli/tests/pcluster/validators/test_cluster_validators.py b/cli/tests/pcluster/validators/test_cluster_validators.py index 37f4598745..19287e525d 100644 --- a/cli/tests/pcluster/validators/test_cluster_validators.py +++ b/cli/tests/pcluster/validators/test_cluster_validators.py @@ -3225,7 +3225,7 @@ class TestDictLaunchTemplateBuilder: "Ebs": { "Encrypted": True, "VolumeType": "mockVolumeType", - "VolumeSize": 40, + "VolumeSize": 45, "Iops": 15, "Throughput": 20, "DeleteOnTermination": True, diff --git a/cli/tests/pcluster3_config_converter/test_data.py b/cli/tests/pcluster3_config_converter/test_data.py index e2808b7ed2..25ad81cff8 100644 --- a/cli/tests/pcluster3_config_converter/test_data.py +++ b/cli/tests/pcluster3_config_converter/test_data.py @@ -872,7 +872,7 @@ scaling_settings = custom scheduler = slurm disable_cluster_dns = true -compute_root_volume_size = 40 +compute_root_volume_size = 45 [vpc default] vpc_id = vpc-0e0f223cc35256b9a @@ -957,7 +957,7 @@ ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 Networking: AdditionalSecurityGroups: - sg-xxxxxx @@ -1001,7 +1001,7 @@ ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 Networking: AdditionalSecurityGroups: - sg-xxxxxx diff --git a/tests/integration-tests/tests/iam/test_iam_image/test_iam_roles/image.config.yaml b/tests/integration-tests/tests/iam/test_iam_image/test_iam_roles/image.config.yaml index 322b80d1f4..e83464b972 100644 --- a/tests/integration-tests/tests/iam/test_iam_image/test_iam_roles/image.config.yaml +++ b/tests/integration-tests/tests/iam/test_iam_image/test_iam_roles/image.config.yaml @@ -3,7 +3,7 @@ Image: - Key: dummyImageTag Value: dummyImageTag RootVolume: - Size: 40 + Size: 45 Build: Iam: diff --git a/tests/integration-tests/tests/storage/test_shared_home/test_shared_home/pcluster.config.yaml b/tests/integration-tests/tests/storage/test_shared_home/test_shared_home/pcluster.config.yaml index 275623980a..509c31f064 100644 --- a/tests/integration-tests/tests/storage/test_shared_home/test_shared_home/pcluster.config.yaml +++ b/tests/integration-tests/tests/storage/test_shared_home/test_shared_home/pcluster.config.yaml @@ -59,5 +59,5 @@ SharedStorage: EbsSettings: Raid: Type: 1 - Size: 40 + Size: 45 {% endif %} diff --git a/tests/integration-tests/tests/update/test_update.py b/tests/integration-tests/tests/update/test_update.py index 11a30b19f9..5601bb3221 100644 --- a/tests/integration-tests/tests/update/test_update.py +++ b/tests/integration-tests/tests/update/test_update.py @@ -745,8 +745,8 @@ def test_queue_parameters_update( ): """Test update cluster with drain strategy.""" # Create cluster with initial configuration - initial_compute_root_volume_size = 40 - updated_compute_root_volume_size = 45 + initial_compute_root_volume_size = 45 + updated_compute_root_volume_size = 50 # If you are running this test in your personal account, then you must have # ParallelCluster AMIs following the official naming convention # and set allow_private_ami to True. diff --git a/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml b/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml index 53b6048e78..3aa7320ae2 100644 --- a/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml +++ b/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.update.yaml @@ -32,7 +32,7 @@ Scheduling: ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 CustomActions: OnNodeStart: Script: s3://{{ resource_bucket }}/scripts/updated_preinstall.sh # Updated parameter value @@ -81,7 +81,7 @@ Scheduling: ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 CustomActions: # New section OnNodeStart: Script: s3://{{ resource_bucket }}/scripts/updated_preinstall.sh @@ -114,7 +114,7 @@ Scheduling: ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 CustomActions: OnNodeStart: Script: s3://{{ resource_bucket }}/scripts/updated_preinstall.sh diff --git a/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml b/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml index 35eaf36c83..e438573909 100644 --- a/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml +++ b/tests/integration-tests/tests/update/test_update/test_update_slurm/pcluster.config.yaml @@ -29,7 +29,7 @@ Scheduling: ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 CustomActions: OnNodeStart: Script: s3://{{ resource_bucket }}/scripts/preinstall.sh @@ -65,7 +65,7 @@ Scheduling: ComputeSettings: LocalStorage: RootVolume: - Size: 40 + Size: 45 ComputeResources: - Name: queue2-i1 Efa: