From 35cc63126a503a76ece9067fb3ba954441d6481d Mon Sep 17 00:00:00 2001
From: Xuanqi He <93849823+hehe7318@users.noreply.github.com>
Date: Thu, 21 Sep 2023 18:14:27 -0400
Subject: [PATCH 1/2] Add validator in rotation script to check custom munge
 key size (#2466)

---
 .../default/slurm/head_node/update_munge_key.sh.erb        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/head_node/update_munge_key.sh.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/head_node/update_munge_key.sh.erb
index 3fc6533f6..a7a118a9c 100644
--- a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/head_node/update_munge_key.sh.erb
+++ b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/head_node/update_munge_key.sh.erb
@@ -32,6 +32,13 @@ if [ -n "${SECRET_ARN}" ]; then
     exit 1
   fi
 
+  # Check munge key size
+  key_size=$(echo "${decoded_key}" | wc -c)
+  if [ $key_size -lt 32 ] || [ $key_size -gt 1024 ]; then
+    echo "Fetched munge key size is out of valid range [256-8192 bits]."
+    exit 1
+  fi
+
   echo "${decoded_key}" > ${MUNGE_KEY_FILE}
 
   # Set ownership on the key

From 47c635405c6832d3e7b1f29a8700d972f5a3ed17 Mon Sep 17 00:00:00 2001
From: Hanwen <68928867+hanwen-pcluste@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:46:02 -0700
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63938c8ac..85fc4572e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,13 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Upgrade Slurm to 23.02.5 (from 23.02.4).
   - Upgrade Pmix to 4.2.6 (from 3.2.3).
   - Upgrade libjwt to 1.15.3 (from 1.12.0).
+- Upgrade EFA installer to `1.26.1`, fixing RDMA writedata issue in P5.
+  - Efa-driver: `efa-2.5.0-1`
+  - Efa-config: `efa-config-1.15-1`
+  - Efa-profile: `efa-profile-1.5-1`
+  - Libfabric-aws: `libfabric-aws-1.18.2-1`
+  - Rdma-core: `rdma-core-46.0-1`
+  - Open MPI: `openmpi40-aws-4.1.5-4`
 
 3.7.0
 ------