Update EFA installer to 1.14.0

Starting from EFA 1.14.0, GDR support is enabled by default. Therefore, this commit also removes the logic to reinstall EFA if GDR is enabled.
In kitchen test, the GDR check is moved to only check official built AMIs. This does not reduce the coverage of the test, because the check had `efa_gdr_enabled?` as part of the condition to execute. `enable_efa_gdr?` checks `node['cfncluster']['enable_efa_gdr']` in dna.json. However, in .kitchen.yml a parameter with wrong name `efa_gdr_enabled` was passed in. So the check was never executed.

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

.kitchen.yml

@@ -105,7 +105,6 @@ suites:
         dcv_port: '8443'
         enable_intel_hpc_platform: 'true'
         enable_efa: 'compute'
-        efa_gdr_enabled: 'compute'
         nvidia:
           enabled: <%= ENV['NVIDIA_ENABLED'] %>
 

CHANGELOG.md

@@ -10,6 +10,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Fix failure when building AMI, due to SGE sources not available at arc.liv.ac.uk
 - Fix cluster update when using proxy setup.
 - Update ca-certificates package during AMI build time and prevent Chef from using outdated/distrusted CA certificates.
+- Upgrade EFA installer to version 1.14.0. Thereafter, EFA enables GDR support by default on supported instance type(s). ParallelCluster does not reinstall EFA during node start. Previously, EFA was reinstalled if `enable_efa_gdr` had been turned on in the configuration file.
 
 2.11.2
 -----

attributes/default.rb

@@ -153,9 +153,8 @@
 )
 
 # EFA
-default['cfncluster']['efa']['installer_version'] = '1.13.0'
+default['cfncluster']['efa']['installer_version'] = '1.14.0'
 default['cfncluster']['efa']['installer_url'] = "https://efa-installer.amazonaws.com/aws-efa-installer-#{node['cfncluster']['efa']['installer_version']}.tar.gz"
-default['cfncluster']['enable_efa_gdr'] = "no"
 default['cfncluster']['efa']['unsupported_aarch64_oses'] = %w[centos7 centos8]
 
 # NICE DCV

libraries/helpers.rb

@@ -413,17 +413,6 @@ def get_nvswitches
   nvswitch_check.stdout.strip.to_i
 end
 
-# Check if EFA GDR is enabled (and supported) on this instance
-def efa_gdr_enabled?
-  config_value = node['cfncluster']['enable_efa_gdr']
-  enabling_value = if node['cfncluster']['cfn_node_type'] == "ComputeFleet"
-                     "compute"
-                   else
-                     "master"
-                   end
-  (config_value == enabling_value || config_value == "cluster") && graphic_instance?
-end
-
 # CentOS8 and alinux OSs currently not correctly supported by NFS cookbook
 # Overwriting templates for node['nfs']['config']['server_template'] used by NFS cookbook for these OSs
 # When running, NFS cookbook will use nfs.conf.erb templates provided in this cookbook to generate server_template

recipes/efa_config.rb

@@ -15,9 +15,6 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Installation recipe must be re-executed at runtime to enable GDR
-include_recipe "aws-parallelcluster::efa_install"
-
 if node['platform'] == 'ubuntu' && node['cfncluster']['enable_efa'] == 'compute' && node['cfncluster']['cfn_node_type'] == 'ComputeFleet'
   # Disabling ptrace protection is needed for EFA in order to use SHA transfer for intra-node communication.
   replace_or_add "disable ptrace protection" do

recipes/efa_install.rb

@@ -19,7 +19,7 @@
 efa_installed = efa_installed?
 
 if efa_installed && !::File.exist?(efa_tarball)
-  Chef::Log.warn("Existing EFA version differs from the one shipped with ParallelCluster. Skipping ParallelCluster EFA installation and configuration. enable_gdr option will be ignored.")
+  Chef::Log.warn("Existing EFA version differs from the one shipped with ParallelCluster. Skipping ParallelCluster EFA installation and configuration.")
   return
 end
 
@@ -50,8 +50,6 @@
 installer_options = "-y"
 # skip efa-kmod installation on not supported platforms
 installer_options += " -k" unless node['conditions']['efa_supported']
-# enable gpudirect support
-installer_options += " -g" if efa_gdr_enabled?
 
 bash "install efa" do
   cwd node['cfncluster']['sources_dir']
@@ -62,7 +60,7 @@
     ./efa_installer.sh #{installer_options}
     rm -rf #{node['cfncluster']['sources_dir']}/aws-efa-installer
   EFAINSTALL
-  not_if { efa_installed && !efa_gdr_enabled? }
+  not_if { efa_installed }
 end
 
 # EFA installer v1.11.0 removes libibverbs-core, which contains hwloc-devel during install

recipes/tests.rb

@@ -363,12 +363,12 @@ module load intelmpi && mpirun --help | grep '#{node['cfncluster']['intelmpi']['
       grep "EFA installer version: #{node['cfncluster']['efa']['installer_version']}" /opt/amazon/efa_installed_packages
     EFA
   end
-end
-# GDR (GPUDirect RDMA)
-if node['conditions']['efa_supported'] && efa_gdr_enabled?
-  execute 'check efa gdr installed' do
-    command "modinfo efa | grep 'gdr:\ *Y'"
-    user node['cfncluster']['cfn_cluster_user']
+  # GDR (GPUDirect RDMA)
+  if node['conditions']['efa_supported']
+    execute 'check efa gdr installed' do
+      command "modinfo efa | grep 'gdr:\ *Y'"
+      user node['cfncluster']['cfn_cluster_user']
+    end
   end
 end