Revision 73064714

b/lib/config.py
1379 1379
        self._temporary_macs.discard(nic.mac)
1380 1380

  
1381 1381
    self._WriteConfig(feedback_fn=feedback_fn)
1382

  
1383
  @locking.ssynchronized(_config_lock)
1384
  def DropECReservations(self, ec_id):
1385
    """Drop per-execution-context reservations
1386

  
1387
    """
1388
    pass
1389

  
b/lib/mcpu.py
451 451
            lu.ExpandNames()
452 452
            assert lu.needed_locks is not None, "needed_locks not set by LU"
453 453

  
454
            return self._LockAndExecLU(lu, locking.LEVEL_INSTANCE,
455
                                       timeout_strategy.CalcRemainingTimeout)
454
            try:
455
              return self._LockAndExecLU(lu, locking.LEVEL_INSTANCE,
456
                                         timeout_strategy.CalcRemainingTimeout)
457
            finally:
458
              if self._ec_id:
459
                self.context.cfg.DropECReservations(self._ec_id)
460

  
456 461
          finally:
457 462
            self.context.glm.release(locking.LEVEL_CLUSTER)
458 463

  

Also available in: Unified diff