summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Use stock argparse --version behaviour"Jenkins2012-11-162-36/+3
|\| | |
| * | | Use stock argparse --version behaviourMark McLoughlin2012-11-152-36/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optparse prints the version to stdout, argparse prints the version to stderr. There's no need to preserve the old optparse behaviour, let's just stick with argparse behaviour. Change-Id: Ie141c72112a63149d098afa9db55a95a309e79d7
* | | | Merge "Remove add_option() method"Jenkins2012-11-161-7/+4
|\| | |
| * | | Remove add_option() methodMark McLoughlin2012-11-151-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | argparse just has an add_argument() method, so there's no reason for us to keep add_option() around. Change-Id: I6f4be089ceaf0fd8c4c99565af392b445916172e
* | | | Merge "Fix the log test so it uses the available context fields."Jenkins2012-11-151-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the log test so it uses the available context fields.Angus Salkeld2012-11-131-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging_context_format_string in log.py references fields that don't exist in the common/context.py so we get errors like: --- File "/usr/lib64/python2.7/logging/__init__.py", line 467, in format s = self._fmt % record.__dict__ KeyError: 'project_id' Logged from file test_log.py, line 42 --- We could change the defaults in log.py but that might cause too much disruption to other projects. Change-Id: Ic3f6039baccb522b5eb2462a87b792c226ca13ef
* | | Merge "Completely remove cfg's disable_interspersed_args()"Jenkins2012-11-152-55/+1
|\ \ \ | |_|/ |/| |
| * | Completely remove cfg's disable_interspersed_args()Mark McLoughlin2012-11-152-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | The use case for disable_interspersed_args() is that nova-manage needs to be able to parse sub-commands. We now have a add_cli_subparsers() method which better supports this use case. Change-Id: I1fcd15889745fe4ddff0ac4bacf385004f9b61af
* | | Merge "argparse support for cfg"Jenkins2012-11-153-70/+268
|\| |
| * | argparse support for cfgLaurence Miao2012-11-153-70/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * openstack/common/cfg.py Optparse is fading out since python 2.7, this patch will help openstack/common work on more advanded version of python(argparse). Now, disable_interspersed_args() has no effect. Added new method add_cli_subparsers, return argparse subparser, for usages such as subcommand. * tests/unit/test_cfg.py SubcommandTestCase added. Disabled test_disable_interspersed_args test entry for happiness of tox, temporarily. Modified test_help for port of argparse. * tools/pip-requires include argparse module for python 2.6 Change-Id: Ie5cbde1a92a92786d64dea0ddfcfbf288c29f960
* | | Merge "Adjust the logging_context_format_string."Jenkins2012-11-151-1/+1
|\ \ \
| * | | Adjust the logging_context_format_string.Lianhao Lu2012-11-141-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixed the bug 1078190. The 'logging_context_format_string' option uses some undefined fields in log.ContextAdapter() and context.RequestContext(), which would result a 'KeyError' exception when calling logging functions. Change-Id: I41ee8a9ac89079c30e970477730c8615fb4636b7
* | | Enable eventlet_backdoor to return port.Matthew Treinish2012-11-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having no return initialize_if_enabled() will now return the port being used for the backdoor. This will allow the use of random ports (which is set with a backdoor_port configuration option set to 0) This will also enable nova to be able to switch to using the version of eventlet_backdoor here instead of the copy in nova.common which will require this change in nova. Change-Id: I01b6966daba410d82281ba86b5d295313ec36c68
* | | Added initialize_service_hook for rpc.Service.Lianhao Lu2012-11-142-0/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the collector part of the bug 1075463. Declaring a consumer topic on the same rpc connection after the consume thread has started would result the eventlet raise RuntimeError exception. So all the declaring work should be done before calling rpc.conn.consume_in_thread(). If the manager of a rpc.Service wants to declare topic consumers other than the default ones created by rpc.Service.start(), it could define the following hook in the manager class: def initialize_service_hook(self, service): # # Do initialization work after rpc connection is created and before # starting consuming thread. # Params: # service: handle to the rpc.Service instance. Change-Id: I80001c32ee4e51e394fed827c91ad5e1eb0f94dc
* | Merge "threadgroup : greethread.cancel() should be kill()"Jenkins2012-11-131-1/+1
|\ \
| * | threadgroup : greethread.cancel() should be kill()Steven Hardy2012-11-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | According to the eventlet documentation, cancel() will only stop a thread if called before the thread starts running, which is not what we want in this context - calling kill() here ensures that a currently running thread is actually stopped, which does not happen with the current cancel() call See : http://eventlet.net/doc/modules/greenthread.html Change-Id: I89c5bb3eb21e656bd865d5082779cf9ab83ad326 Signed-off-by: Steven Hardy <shardy@redhat.com>
* | Merge "Fix QPID reconnect issues"Jenkins2012-11-131-44/+26
|\ \ | |/ |/|
| * Fix QPID reconnect issuesGary Kotton2012-11-071-44/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem results from the eventlet monkey patching and the way in which qpid performs the session reconnection. The solution is to have the qpid reconnection disbaled and the common rpc code performing the reconnection. The time waiting between reconnections will be a multiple of 2 starting at 1 and a maximum of 60 seconds. This works around bug 1073999. Change-Id: I3c53211d23e4e68ed73046cb3c637662ab73b339
* | Merge "Add generate_uuid to uuidutils."Jenkins2012-11-122-0/+11
|\ \
| * | Add generate_uuid to uuidutils.Alex Meade2012-11-092-0/+11
| |/ | | | | | | | | | | | | Currently many projects have their own nearly identical methods for generating uuids. This patch will change that. Change-Id: I0af348ddbdea658331e8e701dcf1f8a12d968479
* | Merge "Clean up dictionary use in RPC drivers"Jenkins2012-11-122-18/+14
|\ \
| * | Clean up dictionary use in RPC driversDoug Hellmann2012-11-072-18/+14
| |/ | | | | | | | | | | | | | | Initialize the base dictionary before setting overrides. Do not modify the argument passed to Connection.__init__. Change-Id: I5479483509efe6966094b50af2703e566a99dace Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | Correcting openstack-common mv to oslo-incubator.Jeremy Stanley2012-11-111-1/+1
| | | | | | | | | | | | | | | | | | The earlier rename of openstack-common to oslo was incorrect; it should have been oslo-incubator instead per the 2102-11-06 Project meeting log. This change corrects its .gitreview file to match CI changes already merged. Change-Id: I9720387576a52654383bfc14f557ed1e06cc0a91
* | Update .gitreview for oslo.Jeremy Stanley2012-11-111-1/+1
|/ | | | | | | | | At the Design Summit it was decided that the OpenStack common modules would be named Oslo as part of an effort to convert them into a core project housing a collection of library dependencies. This handles the necessary update to .gitreview reflecting the new remote name. Change-Id: I350ff95213efe85579bc6fdce125237cb1f7f614
* Merge "Use spawn_n when not capturing return value"Jenkins2012-11-053-5/+5
|\
| * Use spawn_n when not capturing return valueEric Windisch2012-11-043-5/+5
| | | | | | | | | | | | If not capturing the return value, spawn_n is more efficient. Change-Id: Ie6baa934e81e17e2d73f70766628d4bc97b7aa5e
* | Merge "Remove unused imports from rpc test_common."Jenkins2012-11-051-2/+0
|\ \
| * | Remove unused imports from rpc test_common.Russell Bryant2012-11-051-2/+0
| | | | | | | | | | | | Change-Id: Ib7eed482bf452bf171462f9200fde9a83abf4606
* | | Merge "Tweak rpc.queue_get_for to deal with host=None."Jenkins2012-11-052-1/+5
|\| |
| * | Tweak rpc.queue_get_for to deal with host=None.Russell Bryant2012-11-052-1/+5
| | | | | | | | | | | | | | | | | | | | | Make rpc.queue_get_for() just a tad more convenient by dealing with the case of host=None. In that case, just return the base topic. Change-Id: I2f55c2205c219df7481dd6e507caf7182622195b
* | | Merge "Rename rabbit_notifier to rpc_notifier."Jenkins2012-11-052-24/+53
|\ \ \
| * | | Rename rabbit_notifier to rpc_notifier.Dan Prince2012-11-052-24/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous rabbit_notifier module is generic and can be used for all RPC notifications. This commit moves the rabbit_notifier module to rpc_notifier and adds a new deprecated rabbit_notifier module which can be used for Grizzly so that users can have a chance to easily upgrade this config setting. Once this lands here I'd like to do the same in Quantum. Change-Id: I95073b1a8e06673d8e7363a4b37c050adbad97c5
* | | Merge "Restore proper LoggerTestCase"Jenkins2012-11-051-6/+8
|\ \ \ | |/ / |/| |
| * | Restore proper LoggerTestCaseEric Windisch2012-11-051-6/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses bug #1075022 Addresses bug #1075028 LoggerTestCase was no longer running as another test was created with this name (presumably due to copy-paste) The duplicate has been renamed to a more appropriate name: LogLevelTestCase. Because LoggerTestCase was not executing, bitrot has occurred. This patch also addresses those resultant test failures. Change-Id: I4f3820ba748d20606bb484d0adbfe678fa1fa38d
* | Merge "Remove unused greenthread import in lockutils"Jenkins2012-11-051-1/+0
|\ \
| * | Remove unused greenthread import in lockutilsEric Windisch2012-11-041-1/+0
| |/ | | | | | | Change-Id: I24bfe5926aa5b8542b0ae1205d82aeb7a1e85b30
* | Remove openstack.common.config and extensions.Russell Bryant2012-11-056-1711/+0
| | | | | | | | | | | | | | | | | | | | Remove the config module. All core openstack projects are using the cfg module instead so no further development will be done on this module. Also remove the extensions module. This code was imported but there has been no attempt to get any projects to use it. Change-Id: I4a974ba1ea25e94fd55cad243cde5f1ef6a17289
* | Merge "Log CONF from ProcessLauncher.wait, like ServiceLauncher"Jenkins2012-11-052-1/+15
|\ \
| * | Log CONF from ProcessLauncher.wait, like ServiceLauncherDavid Ripton2012-10-312-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1050380 In the unit tests, we need to call CONF so that the config-file option referenced by log_opt_values() is registered. We also need unregister the default_publisher_id option to workaround bug #107372. Change-Id: Icc63237ddf97aaa730c0484974ec05a3080f8f04
* | | Merge "Relax the update.py replace regex."Jenkins2012-11-051-2/+2
|\ \ \
| * | | Relax the update.py replace regex.Angus Salkeld2012-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In service.py there is an import like: try: from openstack.common import rpc except: rpc = None and this currently does not get converted. The only downside is some doc strings also get converted. Change-Id: If283b50b8e889c0a1878e30cd7ff58494fabe634
* | | | Merge "Creates uuidutils module"Jenkins2012-11-052-0/+68
|\ \ \ \
| * | | | Creates uuidutils moduleZhongyue Luo2012-11-022-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1070198 Implements UUID processing functions used across projects. Change-Id: Ife2c972cea727dc7e453008bcd5871607e883d5c
* | | | | Fixes setup compatibility issue on WindowsYaguang Tang2012-11-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug #1052161 "python setup.py build" fails on Windows due to a hardcoded shell path: /bib/sh. Change-Id: Iee0a1fcbdabfd469e92fa73002763d419e75ec27
* | | | | Merge "Make ThreadGroup derived from object to make mocking possible"Jenkins2012-11-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make ThreadGroup derived from object to make mocking possibleAngus Salkeld2012-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else mox says it is not callable. Change-Id: I7ec552f2502c3328a1d87932f329d4446a361fca
* | | | | Merge "kombu's fanout_cast_to_server was calling wrong method"Jenkins2012-11-011-1/+1
|\ \ \ \ \
| * | | | | kombu's fanout_cast_to_server was calling wrong methodChris Behrens2012-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it call the common amqp method fanout_cast_to_server vs cast_to_server. Fixes bug 1074113 Change-Id: If06bde93dab94c6030465a5e7ba329d8936c69e3
* | | | | | Move utils.execute to its own module.Michael Still2012-11-016-146/+208
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move the exceptions raised to being local to the executils module. Change-Id: Ibb2445f92840b9ce4b52373b0b09adb3d6a4a897
* | | | | Merge "Don't log exceptions for GreenletExit and thread_done"Jenkins2012-11-011-11/+12
|\ \ \ \ \ | | |/ / / | |/| | |