Commit ccfbbd2d authored by Iustin Pop's avatar Iustin Pop

Fix RPC mismatch in blockdev_getsize[s]

Commit 92fd2250 added consistency checks in the RPC layer, which broke
the call_blockdev_getsizes RPC call (declared with 's' at the end in
rpc.py, without 's' in the node daemon).

The immediate fix is to correct the rpc function name, the long term
one will be to remove this duplication.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarStephen Shirley <diamond@google.com>
parent 80a01808
......@@ -2574,9 +2574,9 @@ class LUClusterRepairDiskSizes(NoHooksLU):
newl = [v[2].Copy() for v in dskl]
for dsk in newl:
self.cfg.SetDiskID(dsk, node)
result = self.rpc.call_blockdev_getsizes(node, newl)
result = self.rpc.call_blockdev_getsize(node, newl)
if result.fail_msg:
self.LogWarning("Failure in blockdev_getsizes call to node"
self.LogWarning("Failure in blockdev_getsize call to node"
" %s, ignoring", node)
continue
if len(result.data) != len(dskl):
......
......@@ -1096,7 +1096,7 @@ class RpcRunner(object):
return self._SingleNodeCall(node, "blockdev_close", params)
@_RpcTimeout(_TMO_NORMAL)
def call_blockdev_getsizes(self, node, disks):
def call_blockdev_getsize(self, node, disks):
"""Returns the size of the given disks.
This is a single-node call.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment