On Tue, Sep 24, 2013 at 09:29:13AM +0200, Thomas Thrainer wrote: > The parameter format for call_blockdev_getdimensions has changed in a > previous patch. Here, the correct parameter format is used for the RPC > call. > > Signed-off-by: Thomas Thrainer <[email protected]> > --- > lib/cmdlib/cluster.py | 2 +- > lib/cmdlib/instance_storage.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py > index 27c093b..5ed5aa7 100644 > --- a/lib/cmdlib/cluster.py > +++ b/lib/cmdlib/cluster.py > @@ -537,7 +537,7 @@ class LUClusterRepairDiskSizes(NoHooksLU): > # no disks on the node > continue > > - newl = [(v[2].Copy(), v[0]) for v in dskl] > + newl = [([v[2].Copy()], v[0]) for v in dskl] > node_name = self.cfg.GetNodeName(node_uuid) > result = self.rpc.call_blockdev_getdimensions(node_uuid, newl) > if result.fail_msg: > diff --git a/lib/cmdlib/instance_storage.py b/lib/cmdlib/instance_storage.py > index 951b181..d4fd036 100644 > --- a/lib/cmdlib/instance_storage.py > +++ b/lib/cmdlib/instance_storage.py > @@ -1472,7 +1472,7 @@ class LUInstanceGrowDisk(LogicalUnit): > if wipe_disks: > # Get disk size from primary node for wiping > result = self.rpc.call_blockdev_getdimensions( > - self.instance.primary_node, ([self.disk], self.instance)) > + self.instance.primary_node, [([self.disk], self.instance)]) > result.Raise("Failed to retrieve disk size from node '%s'" % > self.instance.primary_node) > > -- > 1.8.4 >
LGTM. Thanks, Jose -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
