Revision d8e0dc17

b/lib/jqueue.py
621 621
                       if n.master_candidate)
622 622

  
623 623
    # Remove master node
624
    try:
625
      del self._nodes[self._my_hostname]
626
    except KeyError:
627
      pass
624
    self._nodes.pop(self._my_hostname, None)
628 625

  
629 626
    # TODO: Check consistency across nodes
630 627

  
......
734 731
    @param node_name: the name of the node to remove
735 732

  
736 733
    """
737
    try:
738
      # The queue is removed by the "leave node" RPC call.
739
      del self._nodes[node_name]
740
    except KeyError:
741
      pass
734
    self._nodes.pop(node_name, None)
742 735

  
743 736
  @staticmethod
744 737
  def _CheckRpcResult(result, nodes, failmsg):

Also available in: Unified diff