From 14f0bc7c986b3ede8170a304b79011148f6a71a5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 4 Apr 2012 10:28:26 -0400 Subject: Use thread local storage from openstack.common. nova.local was recently added to openstack-common. Remove nova.local and use openstack.common.local instead. One benefit of this change is that it is another step toward decoupling nova.rpc from the rest of nova. Change-Id: I0240f4291a81f8390d3f329a11f207a1453d7cab --- nova/context.py | 2 +- nova/local.py | 37 ----------------------------- nova/log.py | 2 +- nova/openstack/common/local.py | 37 +++++++++++++++++++++++++++++ nova/rpc/amqp.py | 2 +- nova/tests/test_local.py | 53 ------------------------------------------ openstack-common.conf | 2 +- 7 files changed, 41 insertions(+), 94 deletions(-) delete mode 100644 nova/local.py create mode 100644 nova/openstack/common/local.py delete mode 100644 nova/tests/test_local.py diff --git a/nova/context.py b/nova/context.py index 160699a11..9555f9fc1 100644 --- a/nova/context.py +++ b/nova/context.py @@ -21,8 +21,8 @@ import copy -from nova import local from nova import log as logging +from nova.openstack.common import local from nova import utils diff --git a/nova/local.py b/nova/local.py deleted file mode 100644 index 19d962732..000000000 --- a/nova/local.py +++ /dev/null @@ -1,37 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack LLC. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""Greenthread local storage of variables using weak references""" - -import weakref - -from eventlet import corolocal - - -class WeakLocal(corolocal.local): - def __getattribute__(self, attr): - rval = corolocal.local.__getattribute__(self, attr) - if rval: - rval = rval() - return rval - - def __setattr__(self, attr, value): - value = weakref.ref(value) - return corolocal.local.__setattr__(self, attr, value) - - -store = WeakLocal() diff --git a/nova/log.py b/nova/log.py index cbc757f2b..7fbfab717 100644 --- a/nova/log.py +++ b/nova/log.py @@ -43,8 +43,8 @@ import traceback import nova from nova import flags -from nova import local from nova.openstack.common import cfg +from nova.openstack.common import local from nova import version diff --git a/nova/openstack/common/local.py b/nova/openstack/common/local.py new file mode 100644 index 000000000..19d962732 --- /dev/null +++ b/nova/openstack/common/local.py @@ -0,0 +1,37 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +"""Greenthread local storage of variables using weak references""" + +import weakref + +from eventlet import corolocal + + +class WeakLocal(corolocal.local): + def __getattribute__(self, attr): + rval = corolocal.local.__getattribute__(self, attr) + if rval: + rval = rval() + return rval + + def __setattr__(self, attr, value): + value = weakref.ref(value) + return corolocal.local.__setattr__(self, attr, value) + + +store = WeakLocal() diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py index 444ade480..5387eff17 100644 --- a/nova/rpc/amqp.py +++ b/nova/rpc/amqp.py @@ -36,8 +36,8 @@ from eventlet import pools from nova import context from nova import exception from nova import flags -from nova import local from nova import log as logging +from nova.openstack.common import local import nova.rpc.common as rpc_common LOG = logging.getLogger(__name__) diff --git a/nova/tests/test_local.py b/nova/tests/test_local.py deleted file mode 100644 index 0ddcd59ac..000000000 --- a/nova/tests/test_local.py +++ /dev/null @@ -1,53 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2012 OpenStack LLC. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import eventlet - -from nova import local -from nova import test - - -class Dict(dict): - """Make weak referencable object.""" - pass - - -class LocalStoreTestCase(test.TestCase): - v1 = Dict(a='1') - v2 = Dict(a='2') - v3 = Dict(a='3') - - def test_thread_unique_storage(self): - """Make sure local store holds thread specific values.""" - expected_set = [] - local.store.a = self.v1 - - def do_something(): - local.store.a = self.v2 - expected_set.append(getattr(local.store, 'a')) - - def do_something2(): - local.store.a = self.v3 - expected_set.append(getattr(local.store, 'a')) - - eventlet.spawn(do_something).wait() - eventlet.spawn(do_something2).wait() - expected_set.append(getattr(local.store, 'a')) - - self.assertTrue(self.v1 in expected_set) - self.assertTrue(self.v2 in expected_set) - self.assertTrue(self.v3 in expected_set) diff --git a/openstack-common.conf b/openstack-common.conf index bc191b959..854e80b14 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,7 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,iniparser +modules=cfg,local,iniparser # The base module to hold the copy of openstack.common base=nova -- cgit