From 79a2c29df365a8802bce80a54909f7f75d46c164 Mon Sep 17 00:00:00 2001 From: Frank Sehr Date: Fri, 8 Sep 2023 16:38:05 -0700 Subject: [PATCH] LU-17045 lnet: ksocklnd-config report errors on cmd failure Make sure that ksocklnd-config script logs an error if any of the commands it attempts to execute fail. The script already does log a warning if it finds any of the routes it is intending to add already exist. It should also report if any of the command execution failed to make the user aware that MR routing setup could not be applied. Test-Parameters: trivial Signed-off-by: Frank Sehr Change-Id: If5a240d224f6a45015d1fc1a9d0a8df58ed661e4 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52327 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Serguei Smirnov Reviewed-by: Neil Brown Reviewed-by: Oleg Drokin --- lustre/scripts/ksocklnd-config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/scripts/ksocklnd-config b/lustre/scripts/ksocklnd-config index dee280b..00f2fc8 100755 --- a/lustre/scripts/ksocklnd-config +++ b/lustre/scripts/ksocklnd-config @@ -166,12 +166,12 @@ do fi ruledelcmd=(/sbin/ip rule del from ${addr[0]} table ${i} '&>/dev/null') ruleaddcmd=(/sbin/ip rule add from ${addr[0]} table ${i}) - eval ${routecmd[@]} - eval ${ruledelcmd[@]} - eval ${ruleaddcmd[@]} - logcmd1=(logger "${me}: ${routecmd[@]}") - logcmd2=(logger "${me}: ${ruledelcmd[@]}") - logcmd3=(logger "${me}: ${ruleaddcmd[@]}") + routeerr=$(eval ${routecmd[@]} 2>&1 >/dev/null) + ruledelerr=$(eval ${ruledelcmd[@]} 2>&1 >/dev/null) + ruleaddcmd=$(eval ${ruleaddcmd[@]} 2>&1 >/dev/null) + logcmd1=(logger "${me}: ${routecmd[@]} ${routeerr}") + logcmd2=(logger "${me}: ${ruledelcmd[@]} ${ruledelerr}") + logcmd3=(logger "${me}: ${ruleaddcmd[@]} ${ruleaddcmd}") eval "${logcmd1[@]}" eval "${logcmd2[@]}" eval "${logcmd3[@]}" -- 1.8.3.1