Check DRBD status on verify-disks

[ganeti-local] / lib / server / noded.py

diff --git a/lib/server/noded.py b/lib/server/noded.py
index 861e01c..ecc7c95 100644 (file)
--- a/lib/server/noded.py
+++ b/lib/server/noded.py
@@ -368,7 +368,8 @@ class NodeRequestHandler(http.server.HttpServerHandler):
     amount = params[1]
     dryrun = params[2]
     backingstore = params[3]
-    return backend.BlockdevGrow(cfbd, amount, dryrun, backingstore)
+    excl_stor = params[4]
+    return backend.BlockdevGrow(cfbd, amount, dryrun, backingstore, excl_stor)
 
   @staticmethod
   def perspective_blockdev_close(params):
@@ -444,6 +445,18 @@ class NodeRequestHandler(http.server.HttpServerHandler):
     return backend.DrbdWaitSync(target_node_uuid, nodes_ip, disks)
 
   @staticmethod
+  def perspective_drbd_needs_activation(params):
+    """Checks if the drbd devices need activation
+
+    Note that this is only valid for drbd disks, so the members of the
+    disk list must all be drbd devices.
+
+    """
+    nodes_ip, disks, target_node_uuid = params
+    disks = [objects.Disk.FromDict(cf) for cf in disks]
+    return backend.DrbdNeedsActivation(target_node_uuid, nodes_ip, disks)
+
+  @staticmethod
   def perspective_drbd_helper(params):
     """Query drbd helper.
 
@@ -723,8 +736,8 @@ class NodeRequestHandler(http.server.HttpServerHandler):
     """Query node information.
 
     """
-    (storage_units, hv_specs, excl_stor) = params
-    return backend.GetNodeInfo(storage_units, hv_specs, excl_stor)
+    (storage_units, hv_specs) = params
+    return backend.GetNodeInfo(storage_units, hv_specs)
 
   @staticmethod
   def perspective_etc_hosts_modify(params):