Merge branch 'stable-2.16' into stable-2.17
[ganeti-github.git] / lib / cmdlib / common.py
index 6ee86b9..b6e673e 100644 (file)
@@ -125,10 +125,11 @@ def CheckNodeGroupInstances(cfg, group_uuid, owned_instance_names):
   wanted_instances = frozenset(cfg.GetInstanceNames(
                                  cfg.GetNodeGroupInstances(group_uuid)))
   if owned_instance_names != wanted_instances:
+    group_name = cfg.GetNodeGroup(group_uuid).name
     raise errors.OpPrereqError("Instances in node group '%s' changed since"
                                " locks were acquired, wanted '%s', have '%s';"
                                " retry the operation" %
-                               (group_uuid,
+                               (group_name,
                                 utils.CommaJoin(wanted_instances),
                                 utils.CommaJoin(owned_instance_names)),
                                errors.ECODE_STATE)
@@ -1588,15 +1589,15 @@ def EnsureKvmdOnNodes(lu, feedback_fn, nodes=None):
   if start_nodes:
     results = lu.rpc.call_node_ensure_daemon(start_nodes, constants.KVMD, True)
     for node_uuid in start_nodes:
-      results[node_uuid].Warn("Failed to start KVM daemon in node '%s'" %
-                              node_uuid, feedback_fn)
+      results[node_uuid].Warn("Failed to start KVM daemon on node '%s'" %
+                              lu.cfg.GetNodeName(node_uuid), feedback_fn)
 
   # Stop KVM where necessary
   if stop_nodes:
     results = lu.rpc.call_node_ensure_daemon(stop_nodes, constants.KVMD, False)
     for node_uuid in stop_nodes:
-      results[node_uuid].Warn("Failed to stop KVM daemon in node '%s'" %
-                              node_uuid, feedback_fn)
+      results[node_uuid].Warn("Failed to stop KVM daemon on node '%s'" %
+                              lu.cfg.GetNodeName(node_uuid), feedback_fn)
 
 
 def WarnAboutFailedSshUpdates(result, master_uuid, feedback_fn):