LGTM, thanks!
On Tue, Apr 1, 2014 at 9:43 AM, Thomas Thrainer <[email protected]> wrote: > After migrating a DRBD based instance, the output of gnt-instance info > was wrong wrt. DRBD minors. This patch fixes the output in such cases. > > Signed-off-by: Thomas Thrainer <[email protected]> > --- > lib/cmdlib/instance_query.py | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/cmdlib/instance_query.py b/lib/cmdlib/instance_query.py > index b31cf41..2d66acd 100644 > --- a/lib/cmdlib/instance_query.py > +++ b/lib/cmdlib/instance_query.py > @@ -343,13 +343,17 @@ class LUInstanceQueryData(NoHooksLU): > # we change the snode then (otherwise we use the one passed in) > if dev.logical_id[0] == instance.primary_node: > snode_uuid = dev.logical_id[1] > + snode_minor = dev.logical_id[4] > + pnode_minor = dev.logical_id[3] > else: > snode_uuid = dev.logical_id[0] > + snode_minor = dev.logical_id[3] > + pnode_minor = dev.logical_id[4] > drbd_info = { > "primary_node": node_uuid2name_fn(instance.primary_node), > - "primary_minor": dev.logical_id[3], > + "primary_minor": pnode_minor, > "secondary_node": node_uuid2name_fn(snode_uuid), > - "secondary_minor": dev.logical_id[4], > + "secondary_minor": snode_minor, > "port": dev.logical_id[2], > "secret": dev.logical_id[5], > } > -- > 1.9.1.423.g4596e3a > >
