From b3da34738200342c3f6a50b5983ebfc24192f4d3 Mon Sep 17 00:00:00 2001 From: Hanwen Date: Wed, 25 Jan 2023 13:00:59 -0800 Subject: [PATCH 1/2] Test FSx performance tuning Signed-off-by: Hanwen --- tests/integration-tests/tests/efa/test_efa.py | 23 +++++++++++++++++-- .../test_efa/test_efa/pcluster.config.yaml | 5 ++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/integration-tests/tests/efa/test_efa.py b/tests/integration-tests/tests/efa/test_efa.py index c419017640..8619db19c5 100644 --- a/tests/integration-tests/tests/efa/test_efa.py +++ b/tests/integration-tests/tests/efa/test_efa.py @@ -14,8 +14,8 @@ import pytest from assertpy import assert_that -from remote_command_executor import RemoteCommandExecutor -from utils import get_compute_nodes_instance_ids +from remote_command_executor import RemoteCommandExecutor, RemoteCommandExecutionError +from utils import get_compute_nodes_instance_ids, get_instance_info from tests.common.assertions import assert_no_errors_in_logs from tests.common.mpi_common import _test_mpi @@ -66,6 +66,8 @@ def test_efa( run_system_analyzer(cluster, scheduler_commands_factory, request, partition="efa-enabled") + _test_fsx_performance_tuning_for_large_instances(instance, remote_command_executor) + if instance in osu_benchmarks_instances: benchmark_failures = [] @@ -138,6 +140,23 @@ def _test_efa_installation(scheduler_commands, remote_command_executor, efa_inst assert_that(result.stdout).does_not_contain("1d0f:efa") +def _test_fsx_performance_tuning_for_large_instances(instance_type, remote_command_executor): + instance_info = get_instance_info(instance_type) + vcpu = instance_info.get("VCpuInfo").get("DefaultVCpus") + memory = instance_info.get("MemoryInfo").get("SizeInMiB") # 256 GiB * 1024 = 262144 MiB + if vcpu > 64: + remote_command_executor.run_remote_command("lctl get_param osc.*OST*.max_rpcs_in_flight | grep 32$") + remote_command_executor.run_remote_command("lctl get_param mdc.*.max_rpcs_in_flight | grep 64$") + remote_command_executor.run_remote_command("lctl get_param mdc.*.max_mod_rpcs_in_flight | grep 50$") + else: + with pytest.raises(RemoteCommandExecutionError): + remote_command_executor.run_remote_command("lctl get_param osc.*OST*.max_rpcs_in_flight | grep 32$") + with pytest.raises(RemoteCommandExecutionError): + remote_command_executor.run_remote_command("lctl get_param mdc.*.max_rpcs_in_flight | grep 64$") + with pytest.raises(RemoteCommandExecutionError): + remote_command_executor.run_remote_command("lctl get_param mdc.*.max_mod_rpcs_in_flight | grep 50$") + + def _test_osu_benchmarks_pt2pt( mpi_version, remote_command_executor, scheduler_commands, test_datadir, instance, slots_per_instance, partition=None ): diff --git a/tests/integration-tests/tests/efa/test_efa/test_efa/pcluster.config.yaml b/tests/integration-tests/tests/efa/test_efa/test_efa/pcluster.config.yaml index a4b474fce8..4842cec93f 100644 --- a/tests/integration-tests/tests/efa/test_efa/test_efa/pcluster.config.yaml +++ b/tests/integration-tests/tests/efa/test_efa/test_efa/pcluster.config.yaml @@ -36,3 +36,8 @@ SharedStorage: - MountDir: /shared Name: name1 StorageType: Ebs + - MountDir: /fsx + Name: name2 + StorageType: FsxLustre + FsxLustreSettings: + StorageCapacity: 1200 From 8dbf7631e97b4a1c4dcc52a15d5ce5a3ad174e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 03:05:44 +0000 Subject: [PATCH 2/2] Update aws-cdk-aws-events requirement from ~=1.137 to ~=1.191 in /cli Updates the requirements on [aws-cdk-aws-events](https://github.com/aws/aws-cdk) to permit the latest version. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.md) - [Commits](https://github.com/aws/aws-cdk/compare/v1.137.0...v1.191.0) --- updated-dependencies: - dependency-name: aws-cdk-aws-events dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- cli/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/requirements.txt b/cli/requirements.txt index ad1a97a199..e5c6ea7270 100644 --- a/cli/requirements.txt +++ b/cli/requirements.txt @@ -10,7 +10,7 @@ aws-cdk.aws-codebuild~=1.137 aws-cdk.aws-dynamodb~=1.137 aws-cdk.aws-ec2~=1.137 aws-cdk.aws-efs~=1.137 -aws-cdk.aws-events~=1.137 +aws-cdk.aws-events~=1.191 aws-cdk.aws-fsx~=1.137 aws-cdk.aws-imagebuilder~=1.137 aws-cdk.aws-iam~=1.137