From 9ff12a2d7dd165ea0c5cc9778ebd8525baa98dd6 Mon Sep 17 00:00:00 2001 From: Yun Mao Date: Mon, 11 Feb 2013 14:38:57 -0500 Subject: 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 --- nova/servicegroup/api.py | 2 -- 1 file changed, 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. -- cgit