x/python-ganttclient
Code Issues Proposed changes

Use thread local storage from openstack.common.

Browse Source 
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
This commit is contained in:
Russell Bryant
2012-04-04 10:28:26 -04:00
parent 5117dd13a4
commit 1604101b1c
4 changed files with 2 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nova/local.py
View File

@@ -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()

2
nova/log.py
View File

@@ -43,8 +43,8 @@ import traceback
import nova import nova
from nova import flags from nova import flags
from nova import local
from nova.openstack.common import cfg from nova.openstack.common import cfg
from nova.openstack.common import local
from nova import version from nova import version

2
nova/rpc/amqp.py
View File

@@ -36,8 +36,8 @@ from eventlet import pools
from nova import context from nova import context
from nova import exception from nova import exception
from nova import flags from nova import flags
from nova import local
from nova import log as logging from nova import log as logging
from nova.openstack.common import local
import nova.rpc.common as rpc_common import nova.rpc.common as rpc_common
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

53
nova/tests/test_local.py
View File

@@ -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)