LGTM, thanks
On Thursday, September 29, 2016 at 2:41:34 PM UTC+1, Brian Foley wrote: > > Node/Node group name is much easier for humans to read. > > Signed-off-by: Brian Foley <[email protected]> > --- > lib/cmdlib/common.py | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/lib/cmdlib/common.py b/lib/cmdlib/common.py > index 1d79a3e..f902164 100644 > --- a/lib/cmdlib/common.py > +++ b/lib/cmdlib/common.py > @@ -126,10 +126,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) > @@ -1584,15 +1585,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): > -- > 2.8.0.rc3.226.g39d4020 > >
