X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/9216a9f73b5cfc8cd0d9ed1fb2d1eec7f2ef9bc8..69b999879d380c6c8ea2e8871085ffe46a13779b:/lib/locking.py diff --git a/lib/locking.py b/lib/locking.py index 2f41d47..382a45c 100644 --- a/lib/locking.py +++ b/lib/locking.py @@ -18,13 +18,17 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -"""Module implementing the Ganeti locking code.""" +# Disable "Invalid name ..." message +# pylint: disable-msg=C0103 -# pylint: disable-msg=W0613,W0201 +"""Module implementing the Ganeti locking code.""" +import os +import select import threading -# Wouldn't it be better to define LockingError in the locking module? -# Well, for now that's how the rest of the code does it... +import time +import errno + from ganeti import errors from ganeti import utils @@ -48,7 +52,310 @@ def ssynchronized(lock, shared=0): return wrap -class SharedLock: +class _SingleNotifyPipeConditionWaiter(object): + """Helper class for SingleNotifyPipeCondition + + """ + __slots__ = [ + "_fd", + "_poller", + ] + + def __init__(self, poller, fd): + """Constructor for _SingleNotifyPipeConditionWaiter + + @type poller: select.poll + @param poller: Poller object + @type fd: int + @param fd: File descriptor to wait for + + """ + object.__init__(self) + self._poller = poller + self._fd = fd + + def __call__(self, timeout): + """Wait for something to happen on the pipe. + + @type timeout: float or None + @param timeout: Timeout for waiting (can be None) + + """ + start_time = time.time() + remaining_time = timeout + + while timeout is None or remaining_time > 0: + try: + result = self._poller.poll(remaining_time) + except EnvironmentError, err: + if err.errno != errno.EINTR: + raise + result = None + + # Check whether we were notified + if result and result[0][0] == self._fd: + break + + # Re-calculate timeout if necessary + if timeout is not None: + remaining_time = start_time + timeout - time.time() + + +class _BaseCondition(object): + """Base class containing common code for conditions. + + Some of this code is taken from python's threading module. + + """ + __slots__ = [ + "_lock", + "acquire", + "release", + ] + + def __init__(self, lock): + """Constructor for _BaseCondition. + + @type lock: threading.Lock + @param lock: condition base lock + + """ + object.__init__(self) + + # Recursive locks are not supported + assert not hasattr(lock, "_acquire_restore") + assert not hasattr(lock, "_release_save") + + self._lock = lock + + # Export the lock's acquire() and release() methods + self.acquire = lock.acquire + self.release = lock.release + + def _is_owned(self): + """Check whether lock is owned by current thread. + + """ + if self._lock.acquire(0): + self._lock.release() + return False + + return True + + def _check_owned(self): + """Raise an exception if the current thread doesn't own the lock. + + """ + if not self._is_owned(): + raise RuntimeError("cannot work with un-aquired lock") + + +class SingleNotifyPipeCondition(_BaseCondition): + """Condition which can only be notified once. + + This condition class uses pipes and poll, internally, to be able to wait for + notification with a timeout, without resorting to polling. It is almost + compatible with Python's threading.Condition, with the following differences: + - notifyAll can only be called once, and no wait can happen after that + - notify is not supported, only notifyAll + + """ + + __slots__ = _BaseCondition.__slots__ + [ + "_poller", + "_read_fd", + "_write_fd", + "_nwaiters", + "_notified", + ] + + _waiter_class = _SingleNotifyPipeConditionWaiter + + def __init__(self, lock): + """Constructor for SingleNotifyPipeCondition + + """ + _BaseCondition.__init__(self, lock) + self._nwaiters = 0 + self._notified = False + self._read_fd = None + self._write_fd = None + self._poller = None + + def _check_unnotified(self): + """Throws an exception if already notified. + + """ + if self._notified: + raise RuntimeError("cannot use already notified condition") + + def _Cleanup(self): + """Cleanup open file descriptors, if any. + + """ + if self._read_fd is not None: + os.close(self._read_fd) + self._read_fd = None + + if self._write_fd is not None: + os.close(self._write_fd) + self._write_fd = None + self._poller = None + + def wait(self, timeout=None): + """Wait for a notification. + + @type timeout: float or None + @param timeout: Waiting timeout (can be None) + + """ + self._check_owned() + self._check_unnotified() + + self._nwaiters += 1 + try: + if self._poller is None: + (self._read_fd, self._write_fd) = os.pipe() + self._poller = select.poll() + self._poller.register(self._read_fd, select.POLLHUP) + + wait_fn = self._waiter_class(self._poller, self._read_fd) + self.release() + try: + # Wait for notification + wait_fn(timeout) + finally: + # Re-acquire lock + self.acquire() + finally: + self._nwaiters -= 1 + if self._nwaiters == 0: + self._Cleanup() + + def notifyAll(self): + """Close the writing side of the pipe to notify all waiters. + + """ + self._check_owned() + self._check_unnotified() + self._notified = True + if self._write_fd is not None: + os.close(self._write_fd) + self._write_fd = None + + +class PipeCondition(_BaseCondition): + """Group-only non-polling condition with counters. + + This condition class uses pipes and poll, internally, to be able to wait for + notification with a timeout, without resorting to polling. It is almost + compatible with Python's threading.Condition, but only supports notifyAll and + non-recursive locks. As an additional features it's able to report whether + there are any waiting threads. + + """ + __slots__ = _BaseCondition.__slots__ + [ + "_nwaiters", + "_single_condition", + ] + + _single_condition_class = SingleNotifyPipeCondition + + def __init__(self, lock): + """Initializes this class. + + """ + _BaseCondition.__init__(self, lock) + self._nwaiters = 0 + self._single_condition = self._single_condition_class(self._lock) + + def wait(self, timeout=None): + """Wait for a notification. + + @type timeout: float or None + @param timeout: Waiting timeout (can be None) + + """ + self._check_owned() + + # Keep local reference to the pipe. It could be replaced by another thread + # notifying while we're waiting. + my_condition = self._single_condition + + assert self._nwaiters >= 0 + self._nwaiters += 1 + try: + my_condition.wait(timeout) + finally: + assert self._nwaiters > 0 + self._nwaiters -= 1 + + def notifyAll(self): + """Notify all currently waiting threads. + + """ + self._check_owned() + self._single_condition.notifyAll() + self._single_condition = self._single_condition_class(self._lock) + + def has_waiting(self): + """Returns whether there are active waiters. + + """ + self._check_owned() + + return bool(self._nwaiters) + + +class _CountingCondition(object): + """Wrapper for Python's built-in threading.Condition class. + + This wrapper keeps a count of active waiters. We can't access the internal + "__waiters" attribute of threading.Condition because it's not thread-safe. + + """ + __slots__ = [ + "_cond", + "_nwaiters", + ] + + def __init__(self, lock): + """Initializes this class. + + """ + object.__init__(self) + self._cond = threading.Condition(lock=lock) + self._nwaiters = 0 + + def notifyAll(self): + """Notifies the condition. + + """ + return self._cond.notifyAll() + + def wait(self, timeout=None): + """Waits for the condition to be notified. + + @type timeout: float or None + @param timeout: Waiting timeout (can be None) + + """ + assert self._nwaiters >= 0 + + self._nwaiters += 1 + try: + return self._cond.wait(timeout=timeout) + finally: + self._nwaiters -= 1 + + def has_waiting(self): + """Returns whether there are active waiters. + + """ + return bool(self._nwaiters) + + +class SharedLock(object): """Implements a shared lock. Multiple threads can acquire the lock in a shared way, calling @@ -60,31 +367,58 @@ class SharedLock: eventually do so. """ + __slots__ = [ + "__active_shr_c", + "__inactive_shr_c", + "__deleted", + "__exc", + "__lock", + "__pending", + "__shr", + ] + + __condition_class = PipeCondition + def __init__(self): - """Construct a new SharedLock""" - # we have two conditions, c_shr and c_exc, sharing the same lock. + """Construct a new SharedLock. + + """ + object.__init__(self) + + # Internal lock self.__lock = threading.Lock() - self.__turn_shr = threading.Condition(self.__lock) - self.__turn_exc = threading.Condition(self.__lock) - # current lock holders + # Queue containing waiting acquires + self.__pending = [] + + # Active and inactive conditions for shared locks + self.__active_shr_c = self.__condition_class(self.__lock) + self.__inactive_shr_c = self.__condition_class(self.__lock) + + # Current lock holders self.__shr = set() self.__exc = None - # lock waiters - self.__nwait_exc = 0 - self.__nwait_shr = 0 - self.__npass_shr = 0 - # is this lock in the deleted state? self.__deleted = False + def __check_deleted(self): + """Raises an exception if the lock has been deleted. + + """ + if self.__deleted: + raise errors.LockError("Deleted lock") + def __is_sharer(self): - """Is the current thread sharing the lock at this time?""" + """Is the current thread sharing the lock at this time? + + """ return threading.currentThread() in self.__shr def __is_exclusive(self): - """Is the current thread holding the lock exclusively at this time?""" + """Is the current thread holding the lock exclusively at this time? + + """ return threading.currentThread() == self.__exc def __is_owned(self, shared=-1): @@ -112,116 +446,124 @@ class SharedLock: """ self.__lock.acquire() try: - result = self.__is_owned(shared=shared) + return self.__is_owned(shared=shared) finally: self.__lock.release() - return result - - def __wait(self, c): - """Wait on the given condition, and raise an exception if the current lock - is declared deleted in the meantime. + def _count_pending(self): + """Returns the number of pending acquires. - @param c: the condition to wait on + @rtype: int """ - c.wait() - if self.__deleted: - raise errors.LockError('deleted lock') + self.__lock.acquire() + try: + return len(self.__pending) + finally: + self.__lock.release() - def __exclusive_acquire(self): - """Acquire the lock exclusively. + def __do_acquire(self, shared): + """Actually acquire the lock. - This is a private function that presumes you are already holding the - internal lock. It's defined separately to avoid code duplication between - acquire() and delete() + """ + if shared: + self.__shr.add(threading.currentThread()) + else: + self.__exc = threading.currentThread() + + def __can_acquire(self, shared): + """Determine whether lock can be acquired. """ - self.__nwait_exc += 1 - try: - # This is to save ourselves from a nasty race condition that could - # theoretically make the sharers starve. - if self.__nwait_shr > 0 or self.__nwait_exc > 1: - self.__wait(self.__turn_exc) + if shared: + return self.__exc is None + else: + return len(self.__shr) == 0 and self.__exc is None - while len(self.__shr) > 0 or self.__exc is not None: - self.__wait(self.__turn_exc) + def __is_on_top(self, cond): + """Checks whether the passed condition is on top of the queue. - self.__exc = threading.currentThread() - finally: - self.__nwait_exc -= 1 + The caller must make sure the queue isn't empty. - assert self.__npass_shr == 0, "SharedLock: internal fairness violation" + """ + return self.__pending[0] == cond - def __shared_acquire(self): - """Acquire the lock in shared mode + def __acquire_unlocked(self, shared, timeout): + """Acquire a shared lock. - This is a private function that presumes you are already holding the - internal lock. + @param shared: whether to acquire in shared mode; by default an + exclusive lock will be acquired + @param timeout: maximum waiting time before giving up """ - self.__nwait_shr += 1 - try: - wait = False - # If there is an exclusive holder waiting we have to wait. - # We'll only do this once, though, when we start waiting for - # the lock. Then we'll just wait while there are no - # exclusive holders. - if self.__nwait_exc > 0: - # TODO: if !blocking... - wait = True - self.__wait(self.__turn_shr) - - while self.__exc is not None: - wait = True - # TODO: if !blocking... - self.__wait(self.__turn_shr) + self.__check_deleted() - self.__shr.add(threading.currentThread()) + # We cannot acquire the lock if we already have it + assert not self.__is_owned(), "double acquire() on a non-recursive lock" + + # Check whether someone else holds the lock or there are pending acquires. + if not self.__pending and self.__can_acquire(shared): + # Apparently not, can acquire lock directly. + self.__do_acquire(shared) + return True - # If we were waiting note that we passed - if wait: - self.__npass_shr -= 1 + if shared: + wait_condition = self.__active_shr_c + # Check if we're not yet in the queue + if wait_condition not in self.__pending: + self.__pending.append(wait_condition) + else: + wait_condition = self.__condition_class(self.__lock) + # Always add to queue + self.__pending.append(wait_condition) + + try: + # Wait until we become the topmost acquire in the queue or the timeout + # expires. + while not (self.__is_on_top(wait_condition) and + self.__can_acquire(shared)): + # Wait for notification + wait_condition.wait(timeout) + self.__check_deleted() + + # A lot of code assumes blocking acquires always succeed. Loop + # internally for that case. + if timeout is not None: + break + + if self.__is_on_top(wait_condition) and self.__can_acquire(shared): + self.__do_acquire(shared) + return True finally: - self.__nwait_shr -= 1 + # Remove condition from queue if there are no more waiters + if not wait_condition.has_waiting() and not self.__deleted: + self.__pending.remove(wait_condition) - assert self.__npass_shr >= 0, "Internal fairness condition weirdness" + return False - def acquire(self, blocking=1, shared=0): + def acquire(self, shared=0, timeout=None, test_notify=None): """Acquire a shared lock. + @type shared: int @param shared: whether to acquire in shared mode; by default an exclusive lock will be acquired - @param blocking: whether to block while trying to acquire or to - operate in try-lock mode (this locking mode is not supported yet) + @type timeout: float + @param timeout: maximum waiting time before giving up + @type test_notify: callable or None + @param test_notify: Special callback function for unittesting """ - if not blocking: - # We don't have non-blocking mode for now - raise NotImplementedError - self.__lock.acquire() try: - if self.__deleted: - raise errors.LockError('deleted lock') - - # We cannot acquire the lock if we already have it - assert not self.__is_owned(), "double acquire() on a non-recursive lock" - assert self.__npass_shr >= 0, "Internal fairness condition weirdness" - - if shared: - self.__shared_acquire() - else: - # TODO: if !blocking... - # (or modify __exclusive_acquire for non-blocking mode) - self.__exclusive_acquire() + # We already got the lock, notify now + if __debug__ and callable(test_notify): + test_notify() + return self.__acquire_unlocked(shared, timeout) finally: self.__lock.release() - return True - def release(self): """Release a Shared Lock. @@ -231,76 +573,62 @@ class SharedLock: """ self.__lock.acquire() try: - assert self.__npass_shr >= 0, "Internal fairness condition weirdness" + assert self.__is_exclusive() or self.__is_sharer(), \ + "Cannot release non-owned lock" + # Autodetect release type if self.__is_exclusive(): self.__exc = None - - # An exclusive holder has just had the lock, time to put it in shared - # mode if there are shared holders waiting. Otherwise wake up the next - # exclusive holder. - if self.__nwait_shr > 0: - # Make sure at least the ones which were blocked pass. - self.__npass_shr = self.__nwait_shr - self.__turn_shr.notifyAll() - elif self.__nwait_exc > 0: - self.__turn_exc.notify() - - elif self.__is_sharer(): + else: self.__shr.remove(threading.currentThread()) - # If there are shared holders waiting (and not just scheduled to pass) - # there *must* be an exclusive holder waiting as well; otherwise what - # were they waiting for? - assert (self.__nwait_exc > 0 or - self.__npass_shr == self.__nwait_shr), \ - "Lock sharers waiting while no exclusive is queueing" + # Notify topmost condition in queue + if self.__pending: + first_condition = self.__pending[0] + first_condition.notifyAll() - # If there are no more shared holders either in or scheduled to pass, - # and some exclusive holders are waiting let's wake one up. - if (len(self.__shr) == 0 and - self.__nwait_exc > 0 and - not self.__npass_shr > 0): - self.__turn_exc.notify() - - else: - assert False, "Cannot release non-owned lock" + if first_condition == self.__active_shr_c: + self.__active_shr_c = self.__inactive_shr_c + self.__inactive_shr_c = first_condition finally: self.__lock.release() - def delete(self, blocking=1): + def delete(self, timeout=None): """Delete a Shared Lock. This operation will declare the lock for removal. First the lock will be acquired in exclusive mode if you don't already own it, then the lock will be put in a state where any future and pending acquire() fail. - @param blocking: whether to block while trying to acquire or to - operate in try-lock mode. this locking mode is not supported - yet unless you are already holding exclusively the lock. + @type timeout: float + @param timeout: maximum waiting time before giving up """ self.__lock.acquire() try: - assert not self.__is_sharer(), "cannot delete() a lock while sharing it" + assert not self.__is_sharer(), "Cannot delete() a lock while sharing it" + + self.__check_deleted() + + # The caller is allowed to hold the lock exclusively already. + acquired = self.__is_exclusive() - if self.__deleted: - raise errors.LockError('deleted lock') + if not acquired: + acquired = self.__acquire_unlocked(0, timeout) - if not self.__is_exclusive(): - if not blocking: - # We don't have non-blocking mode for now - raise NotImplementedError - self.__exclusive_acquire() + assert self.__is_exclusive() and not self.__is_sharer(), \ + "Lock wasn't acquired in exclusive mode" - self.__deleted = True - self.__exc = None - # Wake up everybody, they will fail acquiring the lock and - # raise an exception instead. - self.__turn_exc.notifyAll() - self.__turn_shr.notifyAll() + if acquired: + self.__deleted = True + self.__exc = None + + # Notify all acquires. They'll throw an error. + while self.__pending: + self.__pending.pop().notifyAll() + return acquired finally: self.__lock.release() @@ -310,6 +638,12 @@ class SharedLock: ALL_SET = None +class _AcquireTimeout(Exception): + """Internal exception to abort an acquire on a timeout. + + """ + + class LockSet: """Implements a set of locks. @@ -380,6 +714,12 @@ class LockSet: else: return set() + def _release_and_delete_owned(self): + """Release and delete all resources owned by the current thread""" + for lname in self._list_owned(): + self.__lockdict[lname].release() + self._del_owned(name=lname) + def __names(self): """Return the current set of names. @@ -408,31 +748,43 @@ class LockSet: self.__lock.release() return set(result) - def acquire(self, names, blocking=1, shared=0): + def acquire(self, names, timeout=None, shared=0, test_notify=None): """Acquire a set of resource locks. @param names: the names of the locks which shall be acquired (special lock names, or instance/node names) @param shared: whether to acquire in shared mode; by default an exclusive lock will be acquired - @param blocking: whether to block while trying to acquire or to - operate in try-lock mode (this locking mode is not supported yet) + @type timeout: float or None + @param timeout: Maximum time to acquire all locks + @type test_notify: callable or None + @param test_notify: Special callback function for unittesting - @return: True when all the locks are successfully acquired + @return: Set of all locks successfully acquired or None in case of timeout @raise errors.LockError: when any lock we try to acquire has been deleted before we succeed. In this case none of the locks requested will be acquired. """ - if not blocking: - # We don't have non-blocking mode for now - raise NotImplementedError + assert timeout is None or timeout >= 0.0 # Check we don't already own locks at this level assert not self._is_owned(), "Cannot acquire locks in the same set twice" - if names is None: + # We need to keep track of how long we spent waiting for a lock. The + # timeout passed to this function is over all lock acquires. + remaining_timeout = timeout + if timeout is None: + start = None + calc_remaining_timeout = lambda: None + else: + start = time.time() + calc_remaining_timeout = lambda: (start + timeout) - time.time() + + want_all = names is None + + if want_all: # If no names are given acquire the whole set by not letting new names # being added before we release, and getting the current list of names. # Some of them may then be deleted later, but we'll cope with this. @@ -442,7 +794,7 @@ class LockSet: # them exclusively though they won't be able to do this anyway, though, # so we'll get the list lock exclusively as well in order to be able to # do add() on the set while owning it. - self.__lock.acquire(shared=shared) + self.__lock.acquire(shared=shared, timeout=remaining_timeout) try: # note we own the set-lock self._add_owned() @@ -454,65 +806,103 @@ class LockSet: self.__lock.release() raise + # Re-calculate timeout + remaining_timeout = calc_remaining_timeout() + try: - # Support passing in a single resource to acquire rather than many - if isinstance(names, basestring): - names = [names] - else: - names = sorted(names) - - acquire_list = [] - # First we look the locks up on __lockdict. We have no way of being sure - # they will still be there after, but this makes it a lot faster should - # just one of them be the already wrong - for lname in utils.UniqueSequence(names): - try: - lock = self.__lockdict[lname] # raises KeyError if lock is not there - acquire_list.append((lname, lock)) - except (KeyError): - if self.__lock._is_owned(): - # We are acquiring all the set, it doesn't matter if this - # particular element is not there anymore. - continue - else: - raise errors.LockError('non-existing lock in set (%s)' % lname) - - # This will hold the locknames we effectively acquired. - acquired = set() - # Now acquire_list contains a sorted list of resources and locks we want. - # In order to get them we loop on this (private) list and acquire() them. - # We gave no real guarantee they will still exist till this is done but - # .acquire() itself is safe and will alert us if the lock gets deleted. - for (lname, lock) in acquire_list: - try: - lock.acquire(shared=shared) # raises LockError if the lock is deleted - # now the lock cannot be deleted, we have it! - self._add_owned(name=lname) - acquired.add(lname) - except (errors.LockError): - if self.__lock._is_owned(): - # We are acquiring all the set, it doesn't matter if this - # particular element is not there anymore. - continue + try: + # Support passing in a single resource to acquire rather than many + if isinstance(names, basestring): + names = [names] + else: + names = sorted(names) + + acquire_list = [] + # First we look the locks up on __lockdict. We have no way of being sure + # they will still be there after, but this makes it a lot faster should + # just one of them be the already wrong + for lname in utils.UniqueSequence(names): + try: + lock = self.__lockdict[lname] # raises KeyError if lock is not there + acquire_list.append((lname, lock)) + except KeyError: + if want_all: + # We are acquiring all the set, it doesn't matter if this + # particular element is not there anymore. + continue + else: + raise errors.LockError("Non-existing lock in set (%s)" % lname) + + # This will hold the locknames we effectively acquired. + acquired = set() + + # Now acquire_list contains a sorted list of resources and locks we + # want. In order to get them we loop on this (private) list and + # acquire() them. We gave no real guarantee they will still exist till + # this is done but .acquire() itself is safe and will alert us if the + # lock gets deleted. + for (lname, lock) in acquire_list: + if __debug__ and callable(test_notify): + test_notify_fn = lambda: test_notify(lname) else: - name_fail = lname - for lname in self._list_owned(): - self.__lockdict[lname].release() - self._del_owned(name=lname) - raise errors.LockError('non-existing lock in set (%s)' % name_fail) - except: - # We shouldn't have problems adding the lock to the owners list, but - # if we did we'll try to release this lock and re-raise exception. - # Of course something is going to be really wrong, after this. - if lock._is_owned(): - lock.release() - raise + test_notify_fn = None - except: - # If something went wrong and we had the set-lock let's release it... - if self.__lock._is_owned(): - self.__lock.release() - raise + try: + if timeout is not None and remaining_timeout < 0: + raise _AcquireTimeout() + + # raises LockError if the lock was deleted + if not lock.acquire(shared=shared, timeout=remaining_timeout, + test_notify=test_notify_fn): + # Couldn't get lock or timeout occurred + if timeout is None: + # This shouldn't happen as SharedLock.acquire(timeout=None) is + # blocking. + raise errors.LockError("Failed to get lock %s" % lname) + + raise _AcquireTimeout() + + # Re-calculate timeout + remaining_timeout = calc_remaining_timeout() + + # now the lock cannot be deleted, we have it! + self._add_owned(name=lname) + acquired.add(lname) + + except _AcquireTimeout: + # Release all acquired locks + self._release_and_delete_owned() + raise + + except errors.LockError: + if want_all: + # We are acquiring all the set, it doesn't matter if this + # particular element is not there anymore. + continue + + self._release_and_delete_owned() + + raise errors.LockError("Non-existing lock in set (%s)" % lname) + + except: + # We shouldn't have problems adding the lock to the owners list, but + # if we did we'll try to release this lock and re-raise exception. + # Of course something is going to be really wrong, after this. + if lock._is_owned(): + lock.release() + raise + + except: + # If something went wrong and we had the set-lock let's release it... + if want_all: + self.__lock.release() + raise + + except _AcquireTimeout: + if want_all: + self._del_owned() + + return None return acquired @@ -610,26 +1000,19 @@ class LockSet: return True - def remove(self, names, blocking=1): + def remove(self, names): """Remove elements from the lock set. You can either not hold anything in the lockset or already hold a superset of the elements you want to delete, exclusively. @param names: names of the resource to remove. - @param blocking: whether to block while trying to acquire or to - operate in try-lock mode (this locking mode is not supported - yet unless you are already holding exclusively the locks) - @return:: a list of locks which we removed; the list is always + @return: a list of locks which we removed; the list is always equal to the names list if we were holding all the locks exclusively """ - if not blocking and not self._is_owned(): - # We don't have non-blocking mode for now - raise NotImplementedError - # Support passing in a single resource to remove rather than many if isinstance(names, basestring): names = [names] @@ -784,7 +1167,7 @@ class GanetiLockManager: """ return level == LEVEL_CLUSTER and (names is None or BGL in names) - def acquire(self, level, names, blocking=1, shared=0): + def acquire(self, level, names, timeout=None, shared=0): """Acquire a set of resource locks, at the same level. @param level: the level at which the locks shall be acquired; @@ -793,8 +1176,8 @@ class GanetiLockManager: (special lock names, or instance/node names) @param shared: whether to acquire in shared mode; by default an exclusive lock will be acquired - @param blocking: whether to block while trying to acquire or to - operate in try-lock mode (this locking mode is not supported yet) + @type timeout: float + @param timeout: Maximum time to acquire all locks """ assert level in LEVELS, "Invalid locking level %s" % level @@ -813,8 +1196,7 @@ class GanetiLockManager: " while owning some at a greater one") # Acquire the locks in the set. - return self.__keyring[level].acquire(names, shared=shared, - blocking=blocking) + return self.__keyring[level].acquire(names, shared=shared, timeout=timeout) def release(self, level, names=None): """Release a set of resource locks, at the same level. @@ -854,7 +1236,7 @@ class GanetiLockManager: " while owning some at a greater one") return self.__keyring[level].add(names, acquired=acquired, shared=shared) - def remove(self, level, names, blocking=1): + def remove(self, level, names): """Remove locks from the specified level. You must either already own the locks you are trying to remove @@ -864,8 +1246,6 @@ class GanetiLockManager: it must be a member of LEVELS_MOD @param names: the names of the locks which shall be removed (special lock names, or instance/node names) - @param blocking: whether to block while trying to operate in - try-lock mode (this locking mode is not supported yet) """ assert level in LEVELS_MOD, "Invalid or immutable level %s" % level @@ -877,4 +1257,4 @@ class GanetiLockManager: assert self._is_owned(level) or not self._upper_owned(level), ( "Cannot remove locks at a level while not owning it or" " owning some at a greater one") - return self.__keyring[level].remove(names, blocking=blocking) + return self.__keyring[level].remove(names)