Revision 79a304e1 lib/cmdlib.py

b/lib/cmdlib.py
8463 8463
    try:
8464 8464
      _CreateDisks(self, instance, target_node=target_node)
8465 8465
    except errors.OpExecError:
8466
      self.LogWarning("Device creation failed, reverting...")
8467
      try:
8468
        _RemoveDisks(self, instance, target_node=target_node)
8469
      finally:
8470
        self.cfg.ReleaseDRBDMinors(instance.name)
8471
        raise
8466
      self.LogWarning("Device creation failed")
8467
      self.cfg.ReleaseDRBDMinors(instance.name)
8468
      raise
8472 8469

  
8473 8470
    cluster_name = self.cfg.GetClusterInfo().cluster_name
8474 8471

  
......
10995 10992
      try:
10996 10993
        _CreateDisks(self, iobj)
10997 10994
      except errors.OpExecError:
10998
        self.LogWarning("Device creation failed, reverting...")
10999
        try:
11000
          _RemoveDisks(self, iobj)
11001
        finally:
11002
          self.cfg.ReleaseDRBDMinors(instance)
11003
          raise
10995
        self.LogWarning("Device creation failed")
10996
        self.cfg.ReleaseDRBDMinors(instance)
10997
        raise
11004 10998

  
11005 10999
    feedback_fn("adding instance %s to cluster config" % instance)
11006 11000

  

Also available in: Unified diff