LGTM, thanks

On Fri, Apr 25, 2014 at 11:01 AM, 'Hrvoje Ribicic <[email protected]>' via
ganeti-devel <[email protected]> wrote:

> When creating a DRBD disk, Ganeti reserves minor numbers on a per-node
> basis. In case of a failed disk creation, these reservations should be
> released. During the name/uuid refactoring, the invocation of the
> function that releases the minors was not updated, resulting in no
> minors being released in case of a DRBD disk creation failure.
> Ganeti's verification utilities catch this error and rightly complain.
> This patch fixes the issue by providing the UUID and not the name.
>
> Signed-off-by: Hrvoje Ribicic <[email protected]>
> ---
>  lib/cmdlib/instance.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/cmdlib/instance.py b/lib/cmdlib/instance.py
> index ba537ac..0508c6f 100644
> --- a/lib/cmdlib/instance.py
> +++ b/lib/cmdlib/instance.py
> @@ -1345,7 +1345,7 @@ class LUInstanceCreate(LogicalUnit):
>          CreateDisks(self, iobj)
>        except errors.OpExecError:
>          self.LogWarning("Device creation failed")
> -        self.cfg.ReleaseDRBDMinors(self.op.instance_name)
> +        self.cfg.ReleaseDRBDMinors(instance_uuid)
>          raise
>
>      feedback_fn("adding instance %s to cluster config" %
> self.op.instance_name)
> --
> 1.9.1.423.g4596e3a
>
>


-- 
-- 
Helga Velroyen | Software Engineer | [email protected] |

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

Reply via email to