From: John L. Hammond <john.hammond@intel.com>
Date: Tue, 21 Oct 2014 20:57:35 +0000 (-0500)
Subject: LU-5779 test: wait for CT registration in sanity-hsm test_70
X-Git-Tag: 2.6.90~76
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6dc66068546824a7a0da23fab64fd4934f6be095;ds=sidebyside

LU-5779 test: wait for CT registration in sanity-hsm test_70

In sanity-hsm test_70 wait for the copytool to register before
shutting it down (via SIGINT) so that the desired events may be
emitted.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Ibc3fa26c119cebd10566b9ac3b4d1a754da1aaf2
Reviewed-on: http://review.whamcloud.com/12367
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Jenkins
Reviewed-by: frank zago <fzago@cray.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index c62d901..3fb1e30 100755
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -2758,6 +2758,13 @@ test_70() {
 
 	# Just start and stop the copytool to generate events.
 	cdt_clear_no_retry
+
+	# Wait for the copytool to register.
+	wait_update --verbose $(facet_active_host mds1) \
+		"$LCTL get_param -n ${MDT_PREFIX}0.hsm.agents | grep -o ^uuid" \
+		uuid 100 ||
+		error "copytool failed to register with MDT0000"
+
 	copytool_cleanup
 
 	local REGISTER_EVENT