Skip to content

Commit

Permalink
Sync openstack.common.local from oslo
Browse files Browse the repository at this point in the history
`local` has a broken TLS symbol - strong_store, fixed in oslo some time ago in
Ib544be1485823f6c619312fdee5a04031f48bbb4. All direct and indirect
(lockutils and rpc) usages of strong_store might be potentially affected.
Original change to Nova: If4dd973acc23921dbc2bc69bb76225deb2802dad

Closes-Bug: #1254046
Change-Id: I934149092cacaaa78009565b6d8a6ba348c2dbe4
  • Loading branch information
Ilya Pekelny committed Nov 22, 2013
1 parent 5efe1c2 commit e9468d7
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions glance/openstack/common/local.py
Expand Up @@ -15,16 +15,15 @@
# License for the specific language governing permissions and limitations
# under the License.

"""Greenthread local storage of variables using weak references"""
"""Local storage of variables using weak references"""

import threading
import weakref

from eventlet import corolocal


class WeakLocal(corolocal.local):
class WeakLocal(threading.local):
def __getattribute__(self, attr):
rval = corolocal.local.__getattribute__(self, attr)
rval = super(WeakLocal, self).__getattribute__(attr)
if rval:
# NOTE(mikal): this bit is confusing. What is stored is a weak
# reference, not the value itself. We therefore need to lookup
Expand All @@ -34,7 +33,7 @@ def __getattribute__(self, attr):

def __setattr__(self, attr, value):
value = weakref.ref(value)
return corolocal.local.__setattr__(self, attr, value)
return super(WeakLocal, self).__setattr__(attr, value)


# NOTE(mikal): the name "store" should be deprecated in the future
Expand All @@ -45,4 +44,4 @@ def __setattr__(self, attr, value):
# "strong" store will hold a reference to the object so that it never falls out
# of scope.
weak_store = WeakLocal()
strong_store = corolocal.local
strong_store = threading.local()

0 comments on commit e9468d7

Please sign in to comment.