Merge pull request #1247 from gmelikov/zfs

ZFS agent: check status without locks when possible
ClusterLabs · Oct 17, 2018 · 90d193c · 90d193c
2 parents fb91908 + 2bdeee4
commit 90d193c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/heartbeat/ZFS b/heartbeat/ZFS
@@ -141,7 +141,14 @@ zpool_monitor () {
     fi
 
     # Check the pool status
-    HEALTH=$(zpool list -H -o health "$OCF_RESKEY_pool")
+    # Since version 0.7.10 status can be obtained without locks
+    # https://github.com/zfsonlinux/zfs/pull/7563
+    if [ -f /proc/spl/kstat/zfs/$OCF_RESKEY_pool/state ] ; then
+        HEALTH=$(</proc/spl/kstat/zfs/$OCF_RESKEY_pool/state)
+    else
+        HEALTH=$(zpool list -H -o health "$OCF_RESKEY_pool")
+    fi
+
     case "$HEALTH" in
         ONLINE|DEGRADED) return $OCF_SUCCESS;;
         FAULTED)         return $OCF_NOT_RUNNING;;