From c4ff227514e5613845e36acfbdc3742bd5a3e13d Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 26 Jul 2011 11:32:22 +0200
Subject: [PATCH] cmdlib: Give instance name in error message on group
evacuation
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index f36ec4524..50123f99d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -12005,10 +12005,12 @@ class LUGroupEvacuate(LogicalUnit):
inst_groups = self.cfg.GetInstanceNodeGroups(instance_name)
if not owned_groups.issuperset(inst_groups):
- raise errors.OpPrereqError("Instance's node groups changed since locks"
- " were acquired, current groups are '%s',"
- " owning groups '%s'; retry the operation" %
- (utils.CommaJoin(inst_groups),
+ raise errors.OpPrereqError("Instance %s's node groups changed since"
+ " locks were acquired, current groups"
+ " are '%s', owning groups '%s'; retry the"
+ " operation" %
+ (instance_name,
+ utils.CommaJoin(inst_groups),
utils.CommaJoin(owned_groups)),
errors.ECODE_STATE)
--
GitLab