Revision 3cebe102 lib/cmdlib.py

b/lib/cmdlib.py
1641 1641
    changed = []
1642 1642
    for node, dskl in per_node_disks.items():
1643 1643
      result = self.rpc.call_blockdev_getsizes(node, [v[2] for v in dskl])
1644
      if result.RemoteFailMsg():
1644
      if result.fail_msg:
1645 1645
        self.LogWarning("Failure in blockdev_getsizes call to node"
1646 1646
                        " %s, ignoring", node)
1647 1647
        continue
......
2885 2885
      # and make sure the new node will not have old files around
2886 2886
      if not new_node.master_candidate:
2887 2887
        result = self.rpc.call_node_demote_from_mc(new_node.name)
2888
        msg = result.RemoteFailMsg()
2888
        msg = result.fail_msg
2889 2889
        if msg:
2890 2890
          self.LogWarning("Node failed to demote itself from master"
2891 2891
                          " candidate status: %s" % msg)
......
3013 3013
          changed_mc = True
3014 3014
          result.append(("master_candidate", "auto-demotion due to drain"))
3015 3015
          rrc = self.rpc.call_node_demote_from_mc(node.name)
3016
          msg = rrc.RemoteFailMsg()
3016
          msg = rrc.fail_msg
3017 3017
          if msg:
3018 3018
            self.LogWarning("Node failed to demote itself: %s" % msg)
3019 3019
        if node.offline:
......
4077 4077
        if result.offline:
4078 4078
          # offline nodes will be in both lists
4079 4079
          off_nodes.append(name)
4080
        if result.RemoteFailMsg():
4080
        if result.fail_msg:
4081 4081
          bad_nodes.append(name)
4082 4082
        else:
4083 4083
          if result.payload:

Also available in: Unified diff