Whamcloud - gitweb
LU-17045 lnet: ksocklnd-config report errors on cmd failure 27/52327/2
authorFrank Sehr <fsehr@whamcloud.com>
Fri, 8 Sep 2023 23:38:05 +0000 (16:38 -0700)
committerOleg Drokin <green@whamcloud.com>
Sat, 23 Sep 2023 06:03:41 +0000 (06:03 +0000)
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 <fsehr@whamcloud.com>
Change-Id: If5a240d224f6a45015d1fc1a9d0a8df58ed661e4
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52327
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/scripts/ksocklnd-config

index dee280b..00f2fc8 100755 (executable)
@@ -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[@]}"