diff options
| author | Yun Mao <yunmao@gmail.com> | 2013-02-11 14:38:57 -0500 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2013-02-11 15:38:44 -0500 |
| commit | 9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6 (patch) | |
| tree | f64b9a1aff08afc608eb65d16a67147cd6019417 | |
| parent | 20424b987946ee56e39f88aed7fddd35c54d7207 (diff) | |
| download | nova-9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6.tar.gz nova-9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6.tar.xz nova-9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6.zip | |
Remove locking declarator in ServiceGroup __new__()
The lock-based synchronization is not re-entrant, which
would introduce a deadlock with the new conductor patch.
Because race condition is not be possible in the
eventlet threading model with GIL, we simply remove the
synchronized declarator.
Change-Id: I03e52227385dafd2b2b66bca18cab8445c91f3be
| -rw-r--r-- | nova/servicegroup/api.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/servicegroup/api.py b/nova/servicegroup/api.py index 0fb30cdf5..dcf04e92c 100644 --- a/nova/servicegroup/api.py +++ b/nova/servicegroup/api.py @@ -19,7 +19,6 @@ from nova.openstack.common import cfg from nova.openstack.common import importutils -from nova.openstack.common import lockutils from nova.openstack.common import log as logging from nova import utils @@ -43,7 +42,6 @@ class API(object): 'db': 'nova.servicegroup.drivers.db.DbDriver' } - @lockutils.synchronized('nova.servicegroup.api.new', 'nova-') def __new__(cls, *args, **kwargs): '''Create an instance of the servicegroup API. |