From: Nathaniel Clark <nclark@whamcloud.com>
Date: Fri, 8 Feb 2019 18:02:28 +0000 (-0500)
Subject: LU-11947 scripts: handle ZFS targets in Lustre RA
X-Git-Tag: 2.12.1-RC1~82
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=444cd5f8a0c3eb004a020de4c0009bdf95f1a580;p=fs%2Flustre-release.git

LU-11947 scripts: handle ZFS targets in Lustre RA

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")

Lustre-change: https://review.whamcloud.com/34217
Lustre-commit: aabcfb0af701d641bbe18336b22c7288c96c7115

Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: I1bcb85908019e968ac0d69e437db217594a6565e
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/34316
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/conf/resource/Lustre b/lustre/conf/resource/Lustre
index cafb07b..ea4e140 100755
--- a/lustre/conf/resource/Lustre
+++ b/lustre/conf/resource/Lustre
@@ -98,9 +98,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 () {