Whamcloud - gitweb
LU-11947 scripts: handle ZFS targets in Lustre RA 17/34217/3
authorNathaniel Clark <nclark@whamcloud.com>
Fri, 8 Feb 2019 18:02:28 +0000 (13:02 -0500)
committerOleg Drokin <green@whamcloud.com>
Mon, 18 Feb 2019 06:37:45 +0000 (06:37 +0000)
Fixes a regression introduced in LU-11461
This handles the case of realpath of target being an empty string.

Fixes: c36d70272541 ("LU-11461 scripts: Support symlink target")
Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: I1bcb85908019e968ac0d69e437db217594a6565e
Reviewed-on: https://review.whamcloud.com/34217
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
lustre/conf/resource/Lustre

index fc251fe..91f15c4 100755 (executable)
@@ -107,9 +107,9 @@ lustre_is_mounted () {
     # Verify if this is consistent, check pointpoint and filesystem
     # against source (i.e. device)
     local dev=$(findmnt -t lustre -ln -o SOURCE -T $(realpath "$OCF_RESKEY_mountpoint"))
+    local target=$(realpath "$OCF_RESKEY_target" 2> /dev/null)
 
-    [ -n "$dev" ] &&
-    [ "$dev" == "$OCF_RESKEY_target" -o "$dev" == $(realpath "$OCF_RESKEY_target") ]
+    [ -n "$dev" ] && [ "$dev" == "$OCF_RESKEY_target" -o "$dev" == "$target" ]
 }
 
 lustre_monitor () {