From 1df545eb50d1d1cd2981cbd1784f772213e2c983 Mon Sep 17 00:00:00 2001
From: Elena Gryaznova <elena.gryaznova@hpe.com>
Date: Fri, 4 Sep 2020 14:47:04 +0300
Subject: [PATCH] LU-13948 tests: load modules after reboot_node

LOAD_MODULES_REMOTE should be taken into account
for FAILURE_MODE=HARD.

Test-parameters: envdefinitions="LOAD_MODULES_REMOTE=true"

Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id:  LUS-9283
Reviewed-by: Andriy Skulysh <c17819@cray.com>
Reviewed-by: Vladimir Saveliev <c17830@cray.com>
Change-Id: I85f0a2812ac3be4ac9645d3b165b7371504969f0
Reviewed-on: https://review.whamcloud.com/39829
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/tests/test-framework.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index c8e5d45..0599697 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2706,19 +2706,26 @@ remount_facet() {
 
 reboot_facet() {
 	local facet=$1
+	local node=$(facet_active_host $facet)
+
 	if [ "$FAILURE_MODE" = HARD ]; then
-		reboot_node $(facet_active_host $facet)
+		boot_node $node
 	else
 		sleep 10
 	fi
 }
 
 boot_node() {
-    local node=$1
-    if [ "$FAILURE_MODE" = HARD ]; then
-       reboot_node $node
-       wait_for_host $node
-    fi
+	local node=$1
+
+	if [ "$FAILURE_MODE" = HARD ]; then
+		reboot_node $node
+		wait_for_host $node
+		if $LOAD_MODULES_REMOTE; then
+			echo "loading modules on $node: $facet"
+			do_rpc_nodes $node load_modules_local
+		fi
+	fi
 }
 
 facets_hosts () {
-- 
1.8.3.1