Merge into trunk : rpc-threadpool : Code : OpenStack Compute (nova)

Status:

Merged

Approved by:

Soren Hansen on 2011-02-16

Approved revision:

675

Merged at revision:

683

Proposed branch:

lp:~soren/nova/rpc-threadpool

Merge into:

lp:~hudson-openstack/nova/trunk

Diff against target:

37 lines (+8/-1)

1 file modified

nova/rpc.py (+8/-1)

To merge this branch:

bzr merge lp:~soren/nova/rpc-threadpool

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Devin Carlen (community)		Approve on 2011-02-16
Jay Pipes (community)	2011-02-15	Approve on 2011-02-16
Review via email: mp+49896@code.launchpad.net

Commit message

Use a threadpool for handling requests coming in through RPC.

Description of the change

Is this really this simple?

Revision history for this message

Soren Hansen (soren) wrote on 2011-02-15:

#

I mean.... it does what it says on the tin, but I wonder if there are any
side effects I haven't thought of..

Revision history for this message

Jay Pipes (jaypipes) wrote on 2011-02-16:

#

hmm, lgtm. maybe it really is this easy...

review: Approve

Revision history for this message

Devin Carlen (devcamcar) wrote on 2011-02-16:

#

suspiciously simple! :)

review: Approve

Revision history for this message

OpenStack Infra (hudson-openstack) wrote on 2011-02-16:

#

Download full text (36.3 KiB)

The attempt to merge lp:~soren/nova/rpc-threadpool into lp:nova failed. Below is the output from the failed tests.

Failure
    runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest SerializerTest
    test_basic     test_     test_controller     test_debug     test_router Failure
    runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest LocalizationTestCase
    test_     runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest     runTest ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ok
/>defaults_to_json ok
/>deserialize ok
/>deserialize_empty_xml ok
/>suffix_takes_precedence_over_accept_header ok
ok
ok
ok
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
/>multiple_positional_format_placeholders ok
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR
ERROR

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(...

The attempt to merge lp:~soren/nova/rpc-threadpool into lp:nova failed. Below is the output from the failed tests.

Failure
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
SerializerTest
    test_basic                                                  ok
    test_defaults_to_json                                       ok
    test_deserialize                                            ok
    test_deserialize_empty_xml                                  ok
    test_suffix_takes_precedence_over_accept_header             ok
Test
    test_controller                                             ok
    test_debug                                                  ok
    test_router                                                 ok
Failure
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
LocalizationTestCase
    test_multiple_positional_format_placeholders                ok
Failure
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR
    runTest                                                     ERROR

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/api/ec2/__init__.py", line 35, in <module>
    from nova.api.ec2 import cloud
  File "/tmp/tmpDzH4Dp/nova/api/ec2/cloud.py", line 31, in <module>
    from nova import compute
  File "/tmp/tmpDzH4Dp/nova/compute/__init__.py", line 19, in <module>
    from nova.compute.api import API
  File "/tmp/tmpDzH4Dp/nova/compute/api.py", line 31, in <module>
    from nova import network
  File "/tmp/tmpDzH4Dp/nova/network/__init__.py", line 19, in <module>
    from nova.network.api import API
  File "/tmp/tmpDzH4Dp/nova/network/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/api/openstack/__init__.py", line 32, in <module>
    from nova.api.openstack import consoles
  File "/tmp/tmpDzH4Dp/nova/api/openstack/consoles.py", line 20, in <module>
    from nova import console
  File "/tmp/tmpDzH4Dp/nova/console/__init__.py", line 13, in <module>
    from nova.console.api import API
  File "/tmp/tmpDzH4Dp/nova/console/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/compute/__init__.py", line 19, in <module>
    from nova.compute.api import API
  File "/tmp/tmpDzH4Dp/nova/compute/api.py", line 31, in <module>
    from nova import network
  File "/tmp/tmpDzH4Dp/nova/network/__init__.py", line 19, in <module>
    from nova.network.api import API
  File "/tmp/tmpDzH4Dp/nova/network/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/console/__init__.py", line 13, in <module>
    from nova.console.api import API
  File "/tmp/tmpDzH4Dp/nova/console/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/network/__init__.py", line 19, in <module>
    from nova.network.api import API
  File "/tmp/tmpDzH4Dp/nova/network/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/volume/__init__.py", line 19, in <module>
    from nova.volume.api import API
  File "/tmp/tmpDzH4Dp/nova/volume/api.py", line 30, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: ImportError (cannot import name faults)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/api/openstack/__init__.py", line 23, in <module>
    from nova.api.openstack.ratelimiting import RateLimitingMiddleware
  File "/tmp/tmpDzH4Dp/nova/api/openstack/__init__.py", line 30, in <module>
    from nova.api.openstack import faults
ImportError: cannot import name faults
-------------------- >> begin captured logging << --------------------
2011-02-16 18:57:39,821 INFO migrate.versioning.api [-] 0 -> 1... 
2011-02-16 18:57:39,910 INFO migrate.versioning.api [-] done
2011-02-16 18:57:39,910 INFO migrate.versioning.api [-] 1 -> 2... 
2011-02-16 18:57:39,946 INFO migrate.versioning.api [-] done
--------------------- >> end captured logging << ---------------------

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_access.py", line 24, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_api.py", line 29, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_auth.py", line 25, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_cloud.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_compute.py", line 24, in <module>
    from nova import compute
  File "/tmp/tmpDzH4Dp/nova/compute/__init__.py", line 19, in <module>
    from nova.compute.api import API
  File "/tmp/tmpDzH4Dp/nova/compute/api.py", line 31, in <module>
    from nova import network
  File "/tmp/tmpDzH4Dp/nova/network/__init__.py", line 19, in <module>
    from nova.network.api import API
  File "/tmp/tmpDzH4Dp/nova/network/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_console.py", line 30, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_direct.py", line 26, in <module>
    from nova import compute
  File "/tmp/tmpDzH4Dp/nova/compute/__init__.py", line 19, in <module>
    from nova.compute.api import API
  File "/tmp/tmpDzH4Dp/nova/compute/api.py", line 31, in <module>
    from nova import network
  File "/tmp/tmpDzH4Dp/nova/network/__init__.py", line 19, in <module>
    from nova.network.api import API
  File "/tmp/tmpDzH4Dp/nova/network/api.py", line 27, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_flags.py", line 21, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_log.py", line 5, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: ImportError (cannot import name apirequest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_middleware.py", line 24, in <module>
    from nova.api import ec2
  File "/tmp/tmpDzH4Dp/nova/api/ec2/__init__.py", line 34, in <module>
    from nova.api.ec2 import apirequest
ImportError: cannot import name apirequest

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_misc.py", line 19, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_network.py", line 29, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_quota.py", line 23, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_rpc.py", line 25, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_scheduler.py", line 28, in <module>
    from nova import service
  File "/tmp/tmpDzH4Dp/nova/service.py", line 39, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_service.py", line 29, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_twistd.py", line 25, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_virt.py", line 23, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_volume.py", line 28, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

======================================================================
ERROR: Failure: AttributeError (DEFINE_integer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/loader.py", line 379, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/pymodules/python2.6/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/tmp/tmpDzH4Dp/nova/tests/test_xenapi.py", line 26, in <module>
    from nova import test
  File "/tmp/tmpDzH4Dp/nova/test.py", line 35, in <module>
    from nova import rpc
  File "/tmp/tmpDzH4Dp/nova/rpc.py", line 46, in <module>
    FLAGS.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
  File "/tmp/tmpDzH4Dp/nova/flags.py", line 139, in __getattr__
    val = gflags.FlagValues.__getattr__(self, name)
  File "/usr/lib/python2.6/dist-packages/gflags.py", line 810, in __getattr__
    raise AttributeError(name)
AttributeError: DEFINE_integer

----------------------------------------------------------------------
Ran 37 tests in 1.056s

FAILED (errors=28)

lp:~soren/nova/rpc-threadpool updated on 2011-02-16

674. By Soren Hansen on 2011-02-16: Spell flags correctly (i.e. not in upper case)
675. By Soren Hansen on 2011-02-16: Merge trunk

1	=== modified file 'nova/rpc.py'
2	--- nova/rpc.py 2011-02-11 11:27:50 +0000
3	+++ nova/rpc.py 2011-02-16 19:40:49 +0000
4	@@ -29,6 +29,7 @@
5
6	from carrot import connection as carrot_connection
7	from carrot import messaging
8	+from eventlet import greenpool
9	from eventlet import greenthread
10
11	from nova import context
12	@@ -42,6 +43,8 @@
13	FLAGS = flags.FLAGS
14	LOG = logging.getLogger('nova.rpc')
15
16	+flags.DEFINE_integer('rpc_thread_pool_size', 1024, 'Size of RPC thread pool')
17	+
18
19	class Connection(carrot_connection.BrokerConnection):
20	"""Connection instance object"""
21	@@ -155,11 +158,15 @@
22	def __init__(self, connection=None, topic="broadcast", proxy=None):
23	LOG.debug(_('Initing the Adapter Consumer for %s') % topic)
24	self.proxy = proxy
25	+ self.pool = greenpool.GreenPool(FLAGS.rpc_thread_pool_size)
26	super(AdapterConsumer, self).__init__(connection=connection,
27	topic=topic)
28
29	+ def receive(self, args, *kwargs):
30	+ self.pool.spawn_n(self._receive, args, *kwargs)
31	+
32	@exception.wrap_exception
33	- def receive(self, message_data, message):
34	+ def _receive(self, message_data, message):
35	"""Magically looks for a method on the proxy object and calls it
36
37	Message data should be a dictionary with two keys:

OpenStack Compute (nova)

Merge lp:~soren/nova/rpc-threadpool into lp:~hudson-openstack/nova/trunk

Commit message

Description of the change

Preview Diff

Subscribers