Hello community,
here is the log from the commit of package python-oslo.concurrency for
openSUSE:Factory checked in at 2019-05-03 22:42:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.concurrency (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.concurrency.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.concurrency"
Fri May 3 22:42:04 2019 rev:13 rq:692853 version:3.29.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.concurrency/python-oslo.concurrency.changes
2018-09-07 15:38:44.622578658 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.concurrency.new.5148/python-oslo.concurrency.changes
2019-05-03 22:42:08.639205771 +0200
@@ -1,0 +2,28 @@
+Mon Apr 8 11:44:31 UTC 2019 - [email protected]
+
+- update to version 3.29.1
+ - Switch to stestr
+ - Imported Translations from Zanata
+ - Update mailinglist from dev to discuss
+ - Remove PyPI downloads
+ - Change python3.5 job to python3.7 job on Stein+
+ - import zuul job settings from project-config
+ - ignore warning from bandit for using shell=
+ - Always build universal wheels
+ - Update reno for stable/rocky
+ - Reorganize that 'Release Notes' in README
+ - Don't quote {posargs} in tox.ini
+ - add python 3.6 unit test job
+ - add lib-forward-testing-python3 test job
+ - Remove stale pip-missing-reqs tox test
+ - Trivial: Update pypi url to new url
+ - Add support for fair locks
+ - fix tox python3 overrides
+ - Update hacking version
+ - Clean up .gitignore references to personal tools
+ - Stop using setup.py build_sphinx
+ - Add release notes link to README
+ - add python 3.7 unit test job
+ - Use templates for cover and lower-constraints
+
+-------------------------------------------------------------------
Old:
----
oslo.concurrency-3.27.0.tar.gz
New:
----
oslo.concurrency-3.29.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.concurrency.spec ++++++
--- /var/tmp/diff_new_pack.Nk958v/_old 2019-05-03 22:42:09.039206613 +0200
+++ /var/tmp/diff_new_pack.Nk958v/_new 2019-05-03 22:42:09.043206621 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-oslo.concurrency
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: python-oslo.concurrency
-Version: 3.27.0
+Version: 3.29.1
Release: 0
Summary: OpenStack oslo.concurrency library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.concurrency
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.concurrency/oslo.concurrency-3.27.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.concurrency/oslo.concurrency-3.29.1.tar.gz
BuildRequires: openstack-macros
BuildRequires: python-devel
BuildRequires: python2-enum34 >= 1.0.4
@@ -37,7 +37,7 @@
BuildRequires: python2-oslo.utils >= 3.33.0
BuildRequires: python2-oslotest
BuildRequires: python2-pbr >= 2.0.0
-BuildRequires: python2-testrepository
+BuildRequires: python2-stestr
BuildRequires: python2-testscenarios
BuildRequires: python2-testtools
BuildRequires: python3-eventlet
@@ -49,15 +49,13 @@
BuildRequires: python3-oslo.utils >= 3.33.0
BuildRequires: python3-oslotest
BuildRequires: python3-pbr >= 2.0.0
-BuildRequires: python3-testrepository
+BuildRequires: python3-stestr
BuildRequires: python3-testscenarios
BuildRequires: python3-testtools
Requires: python-fasteners >= 0.7.0
-Requires: python-iso8601
Requires: python-oslo.config >= 5.2.0
Requires: python-oslo.i18n >= 3.15.3
Requires: python-oslo.utils >= 3.33.0
-Requires: python-retrying
Requires: python-six >= 1.10.0
BuildArch: noarch
%ifpython2
@@ -91,9 +89,8 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n oslo.concurrency-3.27.0
+%autosetup -p1 -n oslo.concurrency-3.29.1
%py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}
@@ -114,13 +111,9 @@
%python_uninstall_alternative lockutils-wrapper
%check
-%{python_expand rm -rf .testrepository
-# Test suite fails on 32 bit platforms
-# ifarch/ifnarch can not be used in noarch packages
if [ "%_lib" = "lib64" ]; then
-PYTHON=$python $python setup.py testr
+%python_exec -m stestr.cli run
fi
-}
%files %{python_files}
%license LICENSE
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Nk958v/_old 2019-05-03 22:42:09.063206664 +0200
+++ /var/tmp/diff_new_pack.Nk958v/_new 2019-05-03 22:42:09.067206672 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
<param name="output-name">python-oslo.concurrency.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/oslo.concurrency/stable/rocky/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/oslo.concurrency/stable/stein/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.concurrency</param>
</service>
++++++ oslo.concurrency-3.27.0.tar.gz -> oslo.concurrency-3.29.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/.stestr.conf
new/oslo.concurrency-3.29.1/.stestr.conf
--- old/oslo.concurrency-3.27.0/.stestr.conf 1970-01-01 01:00:00.000000000
+0100
+++ new/oslo.concurrency-3.29.1/.stestr.conf 2019-02-28 19:04:08.000000000
+0100
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_concurrency/tests/unit
+top_path=./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/.testr.conf
new/oslo.concurrency-3.29.1/.testr.conf
--- old/oslo.concurrency-3.27.0/.testr.conf 2018-04-17 17:30:13.000000000
+0200
+++ new/oslo.concurrency-3.29.1/.testr.conf 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
- ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT
$IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/.zuul.yaml
new/oslo.concurrency-3.29.1/.zuul.yaml
--- old/oslo.concurrency-3.27.0/.zuul.yaml 2018-04-17 17:30:13.000000000
+0200
+++ new/oslo.concurrency-3.29.1/.zuul.yaml 2019-02-28 19:04:08.000000000
+0100
@@ -1,7 +1,13 @@
- project:
- check:
- jobs:
- - openstack-tox-lower-constraints
- gate:
- jobs:
- - openstack-tox-lower-constraints
+ templates:
+ - check-requirements
+ - lib-forward-testing
+ - lib-forward-testing-python3
+ - openstack-cover-jobs
+ - openstack-lower-constraints-jobs
+ - openstack-python-jobs
+ - openstack-python36-jobs
+ - openstack-python37-jobs
+ - periodic-stable-jobs
+ - publish-openstack-docs-pti
+ - release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/AUTHORS
new/oslo.concurrency-3.29.1/AUTHORS
--- old/oslo.concurrency-3.27.0/AUTHORS 2018-04-17 17:33:01.000000000 +0200
+++ new/oslo.concurrency-3.29.1/AUTHORS 2019-02-28 19:07:01.000000000 +0100
@@ -14,9 +14,11 @@
Brian Rosmaita <[email protected]>
Chang Bo Guo <[email protected]>
ChangBo Guo(gcb) <[email protected]>
+Chris Friesen <[email protected]>
Christian Berendt <[email protected]>
Chuck Short <[email protected]>
Claudiu Belu <[email protected]>
+Corey Bryant <[email protected]>
Csaba Henk <[email protected]>
Dan Prince <[email protected]>
Daniel P. Berrange <[email protected]>
@@ -34,6 +36,7 @@
Gary Kotton <[email protected]>
Gary Kotton <[email protected]>
Gevorg Davoian <[email protected]>
+Hervé Beraud <[email protected]>
IWAMOTO Toshihiro <[email protected]>
Ian Cordasco <[email protected]>
Ihar Hrachyshka <[email protected]>
@@ -49,6 +52,7 @@
Joshua Harlow <[email protected]>
Joshua Harlow <[email protected]>
Julien Danjou <[email protected]>
+Kenneth Giusti <[email protected]>
Kirill Bespalov <[email protected]>
Lucian Petrut <[email protected]>
Mark McLoughlin <[email protected]>
@@ -78,12 +82,14 @@
Victor Sergeyev <[email protected]>
Victor Stinner <[email protected]>
Victor Stinner <[email protected]>
+Vieri <[email protected]>
+Vu Cong Tuan <[email protected]>
Wu Wenxiang <[email protected]>
Yuriy Taraday <[email protected]>
ZhiQiang Fan <[email protected]>
+ZhijunWei <[email protected]>
ZhongShengping <[email protected]>
Zhongyue Luo <[email protected]>
-Zuul <[email protected]>
gecong1973 <[email protected]>
gengchc2 <[email protected]>
howardlee <[email protected]>
@@ -93,6 +99,8 @@
prashkre <[email protected]>
ricolin <[email protected]>
shangxiaobj <[email protected]>
+shupeng <[email protected]>
vponomaryov <[email protected]>
+wangqi <[email protected]>
yanheven <[email protected]>
zhangsong <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/ChangeLog
new/oslo.concurrency-3.29.1/ChangeLog
--- old/oslo.concurrency-3.27.0/ChangeLog 2018-04-17 17:33:01.000000000
+0200
+++ new/oslo.concurrency-3.29.1/ChangeLog 2019-02-28 19:07:01.000000000
+0100
@@ -1,6 +1,41 @@
CHANGES
=======
+3.29.1
+------
+
+* add python 3.7 unit test job
+* Change python3.5 job to python3.7 job on Stein+
+* Update hacking version
+* Stop using setup.py build\_sphinx
+* Update mailinglist from dev to discuss
+
+3.29.0
+------
+
+* Add support for fair locks
+* Clean up .gitignore references to personal tools
+* Don't quote {posargs} in tox.ini
+* Always build universal wheels
+
+3.28.1
+------
+
+* Imported Translations from Zanata
+* Use templates for cover and lower-constraints
+* ignore warning from bandit for using shell=
+* add lib-forward-testing-python3 test job
+* add python 3.6 unit test job
+* Remove PyPI downloads
+* import zuul job settings from project-config
+* Reorganize that 'Release Notes' in README
+* Update reno for stable/rocky
+* Switch to stestr
+* Add release notes link to README
+* fix tox python3 overrides
+* Remove stale pip-missing-reqs tox test
+* Trivial: Update pypi url to new url
+
3.27.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/PKG-INFO
new/oslo.concurrency-3.29.1/PKG-INFO
--- old/oslo.concurrency-3.27.0/PKG-INFO 2018-04-17 17:33:02.000000000
+0200
+++ new/oslo.concurrency-3.29.1/PKG-INFO 2019-02-28 19:07:01.000000000
+0100
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: oslo.concurrency
-Version: 3.27.0
+Version: 3.29.1
Summary: Oslo Concurrency library
Home-page: https://docs.openstack.org/oslo.concurrency/latest/
Author: OpenStack
-Author-email: [email protected]
+Author-email: [email protected]
License: UNKNOWN
Description: ========================
Team and repository tags
@@ -15,18 +15,14 @@
.. Change things from this point on
- ==================
+ =================
oslo.concurrency
- ==================
+ =================
.. image:: https://img.shields.io/pypi/v/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
+ :target: https://pypi.org/project/oslo.concurrency/
:alt: Latest Version
- .. image:: https://img.shields.io/pypi/dm/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
- :alt: Downloads
-
The oslo.concurrency library has utilities for safely running
multi-thread,
multi-process applications using locking mechanisms and for running
external processes.
@@ -35,6 +31,7 @@
* Documentation: https://docs.openstack.org/oslo.concurrency/latest/
* Source: https://git.openstack.org/cgit/openstack/oslo.concurrency
* Bugs: https://bugs.launchpad.net/oslo.concurrency
+ * Release Notes:
https://docs.openstack.org/releasenotes/oslo.concurrency/
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/README.rst
new/oslo.concurrency-3.29.1/README.rst
--- old/oslo.concurrency-3.27.0/README.rst 2018-04-17 17:30:13.000000000
+0200
+++ new/oslo.concurrency-3.29.1/README.rst 2019-02-28 19:04:08.000000000
+0100
@@ -7,18 +7,14 @@
.. Change things from this point on
-==================
+=================
oslo.concurrency
-==================
+=================
.. image:: https://img.shields.io/pypi/v/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
+ :target: https://pypi.org/project/oslo.concurrency/
:alt: Latest Version
-.. image:: https://img.shields.io/pypi/dm/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
- :alt: Downloads
-
The oslo.concurrency library has utilities for safely running multi-thread,
multi-process applications using locking mechanisms and for running
external processes.
@@ -27,3 +23,4 @@
* Documentation: https://docs.openstack.org/oslo.concurrency/latest/
* Source: https://git.openstack.org/cgit/openstack/oslo.concurrency
* Bugs: https://bugs.launchpad.net/oslo.concurrency
+* Release Notes: https://docs.openstack.org/releasenotes/oslo.concurrency/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/doc/source/user/index.rst
new/oslo.concurrency-3.29.1/doc/source/user/index.rst
--- old/oslo.concurrency-3.27.0/doc/source/user/index.rst 2018-04-17
17:30:13.000000000 +0200
+++ new/oslo.concurrency-3.29.1/doc/source/user/index.rst 2019-02-28
19:04:08.000000000 +0100
@@ -47,6 +47,32 @@
namespacing them to your app so that other apps will not chose the same
names).
+Enabling fair locking
+=====================
+
+By default there is no requirement that the lock is ``fair``. That is, it's
+possible for a thread to block waiting for the lock, then have another thread
+block waiting for the lock, and when the lock is released by the current owner
+the second waiter could acquire the lock before the first. In an extreme case
+you could have a whole string of other threads acquire the lock before the
+first waiter acquires it, resulting in unpredictable amounts of latency.
+
+For cases where this is a problem, it's possible to specify the use of fair
+locks::
+
+ @lockutils.synchronized('not_thread_process_safe', fair=True)
+ def not_thread_process_safe():
+ pass
+
+When using fair locks the lock itself is slightly more expensive (which
+shouldn't matter in most cases), but it will ensure that all threads that
+block waiting for the lock will acquire it in the order that they blocked.
+
+The exception to this is when specifying both ``external`` and ``fair``
+locks. In this case, the ordering *within* a given process will be fair, but
+the ordering *between* processes will be determined by the behaviour of the
+underlying OS.
+
Common ways to prefix/namespace the synchronized decorator
==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/lower-constraints.txt
new/oslo.concurrency-3.29.1/lower-constraints.txt
--- old/oslo.concurrency-3.27.0/lower-constraints.txt 2018-04-17
17:30:29.000000000 +0200
+++ new/oslo.concurrency-3.29.1/lower-constraints.txt 2019-02-28
19:04:08.000000000 +0100
@@ -54,7 +54,7 @@
Sphinx==1.6.2
sphinxcontrib-websupport==1.0.1
stevedore==1.20.0
-testrepository==0.0.18
+stestr==2.0.0
testtools==2.2.0
traceback2==1.4.0
unittest2==1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/PKG-INFO
new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/PKG-INFO
--- old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/PKG-INFO
2018-04-17 17:33:01.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/PKG-INFO
2019-02-28 19:07:01.000000000 +0100
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: oslo.concurrency
-Version: 3.27.0
+Version: 3.29.1
Summary: Oslo Concurrency library
Home-page: https://docs.openstack.org/oslo.concurrency/latest/
Author: OpenStack
-Author-email: [email protected]
+Author-email: [email protected]
License: UNKNOWN
Description: ========================
Team and repository tags
@@ -15,18 +15,14 @@
.. Change things from this point on
- ==================
+ =================
oslo.concurrency
- ==================
+ =================
.. image:: https://img.shields.io/pypi/v/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
+ :target: https://pypi.org/project/oslo.concurrency/
:alt: Latest Version
- .. image:: https://img.shields.io/pypi/dm/oslo.concurrency.svg
- :target: https://pypi.python.org/pypi/oslo.concurrency/
- :alt: Downloads
-
The oslo.concurrency library has utilities for safely running
multi-thread,
multi-process applications using locking mechanisms and for running
external processes.
@@ -35,6 +31,7 @@
* Documentation: https://docs.openstack.org/oslo.concurrency/latest/
* Source: https://git.openstack.org/cgit/openstack/oslo.concurrency
* Bugs: https://bugs.launchpad.net/oslo.concurrency
+ * Release Notes:
https://docs.openstack.org/releasenotes/oslo.concurrency/
Platform: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/SOURCES.txt
new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/SOURCES.txt
--- old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/SOURCES.txt
2018-04-17 17:33:02.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/SOURCES.txt
2019-02-28 19:07:01.000000000 +0100
@@ -1,6 +1,6 @@
.coveragerc
.mailmap
-.testr.conf
+.stestr.conf
.zuul.yaml
AUTHORS
CONTRIBUTING.rst
@@ -56,6 +56,7 @@
oslo_concurrency/tests/unit/test_lockutils.py
oslo_concurrency/tests/unit/test_lockutils_eventlet.py
oslo_concurrency/tests/unit/test_processutils.py
+releasenotes/notes/add-option-for-fair-locks-b6d660e97683cec6.yaml
releasenotes/notes/add-python-exec-kwarg-3a7a0c0849f9bb21.yaml
releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml
releasenotes/source/conf.py
@@ -64,6 +65,7 @@
releasenotes/source/ocata.rst
releasenotes/source/pike.rst
releasenotes/source/queens.rst
+releasenotes/source/rocky.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/pbr.json
new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/pbr.json
--- old/oslo.concurrency-3.27.0/oslo.concurrency.egg-info/pbr.json
2018-04-17 17:33:01.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo.concurrency.egg-info/pbr.json
2019-02-28 19:07:01.000000000 +0100
@@ -1 +1 @@
-{"git_version": "2429c4c", "is_release": true}
\ No newline at end of file
+{"git_version": "e11481b", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo_concurrency/lockutils.py
new/oslo.concurrency-3.29.1/oslo_concurrency/lockutils.py
--- old/oslo.concurrency-3.27.0/oslo_concurrency/lockutils.py 2018-04-17
17:30:13.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo_concurrency/lockutils.py 2019-02-28
19:04:08.000000000 +0100
@@ -87,6 +87,49 @@
"""
+class FairLocks(object):
+ """A garbage collected container of fair locks.
+
+ With a fair lock, contending lockers will get the lock in the order in
+ which they tried to acquire it.
+
+ This collection internally uses a weak value dictionary so that when a
+ lock is no longer in use (by any threads) it will automatically be
+ removed from this container by the garbage collector.
+ """
+
+ def __init__(self):
+ self._locks = weakref.WeakValueDictionary()
+ self._lock = threading.Lock()
+
+ def get(self, name):
+ """Gets (or creates) a lock with a given name.
+
+ :param name: The lock name to get/create (used to associate
+ previously created names with the same lock).
+
+ Returns an newly constructed lock (or an existing one if it was
+ already created for the given name).
+ """
+ with self._lock:
+ try:
+ return self._locks[name]
+ except KeyError:
+ # The fasteners module specifies that
+ # ReaderWriterLock.write_lock() will give FIFO behaviour,
+ # so we don't need to do anything special ourselves.
+ rwlock = ReaderWriterLock()
+ self._locks[name] = rwlock
+ return rwlock
+
+
+_fair_locks = FairLocks()
+
+
+def internal_fair_lock(name):
+ return _fair_locks.get(name)
+
+
class Semaphores(object):
"""A garbage collected container of semaphores.
@@ -170,7 +213,7 @@
@contextlib.contextmanager
def lock(name, lock_file_prefix=None, external=False, lock_path=None,
- do_log=True, semaphores=None, delay=0.01):
+ do_log=True, semaphores=None, delay=0.01, fair=False):
"""Context based lock
This function yields a `threading.Semaphore` instance (if we don't use
@@ -200,16 +243,26 @@
:param delay: Delay between acquisition attempts (in seconds).
+ :param fair: Whether or not we want a "fair" lock where contending lockers
+ will get the lock in the order in which they tried to acquire it.
+
.. versionchanged:: 0.2
Added *do_log* optional parameter.
.. versionchanged:: 0.3
Added *delay* and *semaphores* optional parameters.
"""
- int_lock = internal_lock(name, semaphores=semaphores)
+ if fair:
+ if semaphores is not None:
+ raise NotImplementedError(_('Specifying semaphores is not '
+ 'supported when using fair locks.'))
+ # The fastners module specifies that write_lock() provides fairness.
+ int_lock = internal_fair_lock(name).write_lock()
+ else:
+ int_lock = internal_lock(name, semaphores=semaphores)
with int_lock:
if do_log:
- LOG.debug('Acquired semaphore "%(lock)s"', {'lock': name})
+ LOG.debug('Acquired lock "%(lock)s"', {'lock': name})
try:
if external and not CONF.oslo_concurrency.disable_process_locking:
ext_lock = external_lock(name, lock_file_prefix, lock_path)
@@ -225,11 +278,11 @@
yield int_lock
finally:
if do_log:
- LOG.debug('Releasing semaphore "%(lock)s"', {'lock': name})
+ LOG.debug('Releasing lock "%(lock)s"', {'lock': name})
def synchronized(name, lock_file_prefix=None, external=False, lock_path=None,
- semaphores=None, delay=0.01):
+ semaphores=None, delay=0.01, fair=False):
"""Synchronization decorator.
Decorating a method like so::
@@ -264,7 +317,8 @@
t2 = None
try:
with lock(name, lock_file_prefix, external, lock_path,
- do_log=False, semaphores=semaphores, delay=delay):
+ do_log=False, semaphores=semaphores, delay=delay,
+ fair=fair):
t2 = timeutils.now()
LOG.debug('Lock "%(name)s" acquired by "%(function)s" :: '
'waited %(wait_secs)0.3fs',
@@ -348,7 +402,7 @@
lockutils-wrapper
If you run this:
- lockutils-wrapper python setup.py testr <etc>
+ lockutils-wrapper stestr run <etc>
a temporary directory will be created for all your locks and passed to all
your tests in an environment variable. The temporary dir will be deleted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/oslo_concurrency/opts.py
new/oslo.concurrency-3.29.1/oslo_concurrency/opts.py
--- old/oslo.concurrency-3.27.0/oslo_concurrency/opts.py 2018-04-17
17:30:13.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo_concurrency/opts.py 2019-02-28
19:04:08.000000000 +0100
@@ -12,17 +12,15 @@
# License for the specific language governing permissions and limitations
# under the License.
+import copy
+
+from oslo_concurrency import lockutils
__all__ = [
'list_opts',
]
-import copy
-
-from oslo_concurrency import lockutils
-
-
def list_opts():
"""Return a list of oslo.config options available in the library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo_concurrency/processutils.py
new/oslo.concurrency-3.29.1/oslo_concurrency/processutils.py
--- old/oslo.concurrency-3.27.0/oslo_concurrency/processutils.py
2018-04-17 17:30:29.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo_concurrency/processutils.py
2019-02-28 19:04:08.000000000 +0100
@@ -386,7 +386,7 @@
stderr=_PIPE,
close_fds=close_fds,
preexec_fn=on_preexec_fn,
- shell=shell,
+ shell=shell, # nosec:B604
cwd=cwd,
env=env_variables)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/oslo_concurrency/tests/unit/test_lockutils.py
new/oslo.concurrency-3.29.1/oslo_concurrency/tests/unit/test_lockutils.py
--- old/oslo.concurrency-3.27.0/oslo_concurrency/tests/unit/test_lockutils.py
2018-04-17 17:30:13.000000000 +0200
+++ new/oslo.concurrency-3.29.1/oslo_concurrency/tests/unit/test_lockutils.py
2019-02-28 19:04:08.000000000 +0100
@@ -147,6 +147,45 @@
self.assertEqual(saved_sem_num, len(lockutils._semaphores),
"Semaphore leak detected")
+ def test_lock_internal_fair(self):
+ """Check that we're actually fair."""
+
+ def f(_id):
+ with lockutils.lock('testlock', 'test-',
+ external=False, fair=True):
+ lock_holder.append(_id)
+
+ lock_holder = []
+ threads = []
+ # While holding the fair lock, spawn a bunch of threads that all try
+ # to acquire the lock. They will all block. Then release the lock
+ # and see what happens.
+ with lockutils.lock('testlock', 'test-', external=False, fair=True):
+ for i in range(10):
+ thread = threading.Thread(target=f, args=(i,))
+ threads.append(thread)
+ thread.start()
+ # Allow some time for the new thread to get queued onto the
+ # list of pending writers before continuing. This is gross
+ # but there's no way around it without using knowledge of
+ # fasteners internals.
+ time.sleep(0.5)
+ # Wait for all threads.
+ for thread in threads:
+ thread.join()
+
+ self.assertEqual(10, len(lock_holder))
+ # Check that the threads each got the lock in fair order.
+ for i in range(10):
+ self.assertEqual(i, lock_holder[i])
+
+ def test_fair_lock_with_semaphore(self):
+ def do_test():
+ s = lockutils.Semaphores()
+ with lockutils.lock('testlock', 'test-', semaphores=s, fair=True):
+ pass
+ self.assertRaises(NotImplementedError, do_test)
+
def test_nested_synchronized_external_works(self):
"""We can nest external syncs."""
tempdir = tempfile.mkdtemp()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/releasenotes/notes/add-option-for-fair-locks-b6d660e97683cec6.yaml
new/oslo.concurrency-3.29.1/releasenotes/notes/add-option-for-fair-locks-b6d660e97683cec6.yaml
---
old/oslo.concurrency-3.27.0/releasenotes/notes/add-option-for-fair-locks-b6d660e97683cec6.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.concurrency-3.29.1/releasenotes/notes/add-option-for-fair-locks-b6d660e97683cec6.yaml
2019-02-28 19:04:08.000000000 +0100
@@ -0,0 +1,15 @@
+---
+prelude: >
+ This release includes optional support for fair locks. When fair locks
+ are specified, blocking waiters will acquire the lock in the order that
+ they blocked.
+features:
+ - |
+ We now have optional support for ``fair`` locks. When fair locks are
+ specified, blocking waiters will acquire the lock in the order that they
+ blocked. This can be useful to ensure that existing blocked waiters do
+ not wait indefinitely in the face of large numbers of new attempts to
+ acquire the lock. When specifying locks as both ``external`` and ``fair``,
+ the ordering *within* a given process will be fair, but the ordering
+ *between* processes will be determined by the behaviour of the underlying
+ OS.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/releasenotes/source/index.rst
new/oslo.concurrency-3.29.1/releasenotes/source/index.rst
--- old/oslo.concurrency-3.27.0/releasenotes/source/index.rst 2018-04-17
17:30:13.000000000 +0200
+++ new/oslo.concurrency-3.29.1/releasenotes/source/index.rst 2019-02-28
19:04:08.000000000 +0100
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ rocky
queens
pike
ocata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
new/oslo.concurrency-3.29.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
---
old/oslo.concurrency-3.27.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2018-04-17 17:30:13.000000000 +0200
+++
new/oslo.concurrency-3.29.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2019-02-28 19:04:08.000000000 +0100
@@ -3,13 +3,13 @@
# Andi Chandler <[email protected]>, 2018. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: oslo.concurrency Release Notes\n"
+"Project-Id-Version: oslo.concurrency\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-23 11:40+0000\n"
+"POT-Creation-Date: 2018-08-27 12:03+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-01-26 07:19+0000\n"
+"PO-Revision-Date: 2018-09-16 09:03+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en_GB\n"
@@ -49,6 +49,9 @@
msgid "Queens Series Release Notes"
msgstr "Queens Series Release Notes"
+msgid "Rocky Series Release Notes"
+msgstr "Rocky Series Release Notes"
+
msgid "Switch to reno for managing release notes."
msgstr "Switch to reno for managing release notes."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.27.0/releasenotes/source/rocky.rst
new/oslo.concurrency-3.29.1/releasenotes/source/rocky.rst
--- old/oslo.concurrency-3.27.0/releasenotes/source/rocky.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.concurrency-3.29.1/releasenotes/source/rocky.rst 2019-02-28
19:04:08.000000000 +0100
@@ -0,0 +1,6 @@
+===================================
+ Rocky Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/setup.cfg
new/oslo.concurrency-3.29.1/setup.cfg
--- old/oslo.concurrency-3.27.0/setup.cfg 2018-04-17 17:33:02.000000000
+0200
+++ new/oslo.concurrency-3.29.1/setup.cfg 2019-02-28 19:07:01.000000000
+0100
@@ -4,7 +4,7 @@
description-file =
README.rst
author = OpenStack
-author-email = [email protected]
+author-email = [email protected]
home-page = https://docs.openstack.org/oslo.concurrency/latest/
classifier =
Environment :: OpenStack
@@ -54,7 +54,7 @@
[pbr]
warnerrors = True
-[wheel]
+[bdist_wheel]
universal = 1
[egg_info]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/test-requirements.txt
new/oslo.concurrency-3.29.1/test-requirements.txt
--- old/oslo.concurrency-3.27.0/test-requirements.txt 2018-04-17
17:30:29.000000000 +0200
+++ new/oslo.concurrency-3.29.1/test-requirements.txt 2019-02-28
19:04:08.000000000 +0100
@@ -2,11 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
# These are needed for docs generation
openstackdocstheme>=1.18.1 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.27.0/tox.ini
new/oslo.concurrency-3.29.1/tox.ini
--- old/oslo.concurrency-3.27.0/tox.ini 2018-04-17 17:30:29.000000000 +0200
+++ new/oslo.concurrency-3.29.1/tox.ini 2019-02-28 19:04:08.000000000 +0100
@@ -3,7 +3,6 @@
envlist = py35,py27,pep8
[testenv]
-basepython = python3
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
@@ -11,13 +10,14 @@
-r{toxinidir}/requirements.txt
# We want to support both vanilla stdlib and eventlet monkey patched
commands =
- lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
- env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest
--testr-args='{posargs}'
+ lockutils-wrapper stestr run --slowest {posargs}
+ env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
[testenv:py27]
basepython = python2.7
[testenv:pep8]
+basepython = python3
deps =
-r{toxinidir}/test-requirements.txt
commands =
@@ -26,13 +26,25 @@
bandit -r oslo_concurrency -x tests -n5 --skip B311,B404,B603,B606
[testenv:venv]
+basepython = python3
commands = {posargs}
[testenv:docs]
-commands = python setup.py build_sphinx
+basepython = python3
+whitelist_externals = rm
+commands =
+ rm -fr doc/build
+ sphinx-build -W -b html doc/source doc/build/html {posargs}
[testenv:cover]
-commands = python setup.py test --coverage
--coverage-package-name=oslo_concurrency --testr-args='{posargs}'
+basepython = python3
+setenv =
+ PYTHON=coverage run --source oslo_concurrency --parallel-mode
+commands =
+ stestr run {posargs}
+ coverage combine
+ coverage html -d cover
+ coverage xml -o cover/coverage.xml
[flake8]
show-source = True
@@ -43,18 +55,12 @@
import_exceptions =
oslo_concurrency._i18n
-[testenv:pip-missing-reqs]
-# do not install test-requirements as that will pollute the virtualenv for
-# determining missing packages
-# this also means that pip-missing-reqs must be installed separately, outside
-# of the requirements.txt files
-deps = pip_missing_reqs
-commands = pip-missing-reqs -d --ignore-module=oslo_concurrency*
--ignore-file=oslo_concurrency/tests/* --ignore-file=tests/ oslo_concurrency
-
[testenv:releasenotes]
+basepython = python3
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
[testenv:lower-constraints]
+basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt