On Tue, Feb 15, 2011 at 14:45, Iustin Pop <[email protected]> wrote: > 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. > --- > lib/cmdlib.py | 4 ++-- > lib/rpc.py | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lib/cmdlib.py b/lib/cmdlib.py > index c062250..05cf991 100644 > --- a/lib/cmdlib.py > +++ b/lib/cmdlib.py > @@ -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): > diff --git a/lib/rpc.py b/lib/rpc.py > index bd625de..4e2693e 100644 > --- a/lib/rpc.py > +++ b/lib/rpc.py > @@ -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. > -- > 1.7.3.1 > >
LGTM Steve
