[PATCH master 02/12] VerifyNode: add usermode helper reply

[Luca Bigliardi]

Signed-off-by: Luca Bigliardi <shamm...@google.com>
---
 lib/backend.py   |   10 ++++++++++
 lib/constants.py |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/lib/backend.py b/lib/backend.py
index 0e3c2e2..c6e5c30 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -584,6 +584,16 @@ def VerifyNode(what, cluster_name):
       used_minors = str(err)
     result[constants.NV_DRBDLIST] = used_minors
 
+  if constants.NV_DRBDHELPER in what:
+    status = True
+    try:
+      payload = bdev.BaseDRBD.GetUsermodeHelper()
+    except errors.BlockDeviceError, err:
+      logging.error("Can't get DRBD usermode helper: %s", str(err))
+      status = False
+      payload = str(err)
+    result[constants.NV_DRBDHELPER] = (status, payload)
+
   if constants.NV_NODESETUP in what:
     result[constants.NV_NODESETUP] = tmpr = []
     if not os.path.isdir("/sys/block") or not os.path.isdir("/sys/class/net"):
diff --git a/lib/constants.py b/lib/constants.py
index 672a2c0..58354aa 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -710,6 +710,7 @@ VERIFY_NPLUSONE_MEM = 'nplusone_mem'
 VERIFY_OPTIONAL_CHECKS = frozenset([VERIFY_NPLUSONE_MEM])
 
 # Node verify constants
+NV_DRBDHELPER = "drbd-helper"
 NV_DRBDLIST = "drbd-list"
 NV_FILELIST = "filelist"
 NV_HVINFO = "hvinfo"
-- 
1.7.1