openstack/nova
Code Issues Proposed changes

fix TypeError with unstarted threads in nova-network

Browse Source 
(nova): TRACE: File "/usr/lib64/python2.6/site-packages/nova/utils.py",
line 860, in __init__
(nova): TRACE: self.tname = "-%x-%x" % (ident & 0xffffffff, gident &
0xffffffff)
(nova): TRACE: TypeError: unsupported operand type(s) for &: 'NoneType'
and 'int'

Fixes: bug 971629

Change-Id: I3d34816c36a11cd6fc2dd9c889c93c5872133a2c
This commit is contained in:
Ionuț Arțăriși 2012-04-02 16:34:48 +02:00
parent a8aa3ffdeb
commit 48c191ffea
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -73,6 +73,7 @@ Hengqing Hu <hudayou@hotmail.com>
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com> Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ilyaalekseyev@acm.org> Ilya Alekseyev <ilyaalekseyev@acm.org>
Ionuț Arțăriși <iartarisi@suse.cz>
Isaku Yamahata <yamahata@valinux.co.jp> Isaku Yamahata <yamahata@valinux.co.jp>
Ivan Kolodyazhny <e0ne@e0ne.info> Ivan Kolodyazhny <e0ne@e0ne.info>
J. Daniel Schmidt <jdsn@suse.de> J. Daniel Schmidt <jdsn@suse.de>

2
nova/utils.py
View File

@ -856,7 +856,7 @@ class GreenLockFile(lockfile.FileLock):
t = threading.current_thread() t = threading.current_thread()
# Thread objects in Python 2.4 and earlier do not have ident # Thread objects in Python 2.4 and earlier do not have ident
# attrs. Worm around that. # attrs. Worm around that.
ident = getattr(t, "ident", hash(t)) ident = getattr(t, "ident", hash(t)) or hash(t)
gident = corolocal.get_ident() gident = corolocal.get_ident()
self.tname = "-%x-%x" % (ident & 0xffffffff, gident & 0xffffffff) self.tname = "-%x-%x" % (ident & 0xffffffff, gident & 0xffffffff)
else: else: