summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Remove sitepackages=True from tox.ini"Jenkins2012-11-241-2/+0
|\ \
| * | Remove sitepackages=True from tox.iniMark McLoughlin2012-11-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1082002 With sitepackages=True, I'm seeing the tests fail on my machine because the older system version of nose gets used. Looking at other projects, this is only set in the tox:jenkins section where one exists. Change-Id: I1ab5f337adf8fc668608146ccb2ab3f2590204be
* | | Merge "raise_on_error parameter shouldn't be passed to task function"Jenkins2012-11-242-17/+11
|\ \ \ | |_|/ |/| |
| * | raise_on_error parameter shouldn't be passed to task functiongongysh2012-11-232-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the run_periodic_tasks() so that It has known parameters. Task function has the only parameter 'context' Bug #1081428 Change-Id: Ibc3da521df3dc47f8c136ade1070112fd5ea1039
* | | Merge "Account for tasks duration in LoopingCall delay"Jenkins2012-11-233-12/+61
|\ \ \
| * | | Account for tasks duration in LoopingCall delayEoghan Glynn2012-11-193-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1079725 Previously the time spent executing tasks was not accounted for when determining how much time to sleep between task runs. Now we subtract the duration of the last tasks run from the next sleep interval. Change-Id: I4b3e27d4aaa21d020159d46eea40bdd80361cea7
* | | | Merge "Convenience wrapper for datetime.timedelta.total_seconds()"Jenkins2012-11-232-0/+20
|\| | | | |/ / |/| |
| * | Convenience wrapper for datetime.timedelta.total_seconds()Eoghan Glynn2012-11-192-0/+20
| | | | | | | | | | | | | | | | | | | | | Allows time deltas in seconds to be concisely calculated for py26 and py27. Change-Id: I8987af1f892fda0a72f5eb0d45f94c595792dc78
* | | Merge "update deprecated stanza"Jenkins2012-11-222-4/+4
|\ \ \ | |_|/ |/| |
| * | update deprecated stanzaSean Dague2012-11-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | the deprecated stanza from nova had hard coded "Deprecated Config", but is now be used in not config scenarios. Update it to just "Deprecated". Change-Id: Icf86447aea6cd509e4e67fe0be7e9157006410a4
* | | Merge "updating sphinx documentation"Jenkins2012-11-2020-51/+1301
|\ \ \
| * | | updating sphinx documentationJoe Heck2012-11-1820-51/+1301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding openstack theming (copied from keystone project theme) * updating .gitignore to ignore generated API docs * updated formatting in index.rst page * updaed openstack/common/processutils.py to match hacking docstring * updated docstrings to resolve sphinx warnings Change-Id: Ie89afe20eeab1efd2daf440fc65ccdf90f723c51
* | | | Merge "Fix update.py string interpolation"Jenkins2012-11-191-1/+1
|\ \ \ \
| * | | | Fix update.py string interpolationKiall Mac Innes2012-11-181-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I4b0d31089cbc329ae4bc4af94edd6ac647f49fa1
* | | | Merge "Use the ThreadGroup for the Launcher"Jenkins2012-11-191-11/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use the ThreadGroup for the LauncherAngus Salkeld2012-11-131-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicate code. Change-Id: I06523f846e851b2e5766a7a9b078f728c0755c5f
* | | | Merge "Change RPC cleanup ordering"Jenkins2012-11-161-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change RPC cleanup orderingJeff Peeler2012-11-121-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | RPC cleanup should occur before killing service threadgroup. Otherwise, the connection pool is going to be (attempted) emptied after the thread has been killed. Change-Id: Ie2b2aca495928b7ba39b2175202a072b3592ad72 Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
* | | Don't reference argparse._StoreActionMark McLoughlin2012-11-161-17/+2
| | | | | | | | | | | | | | | | | | | | | This is a private implementation detail of argparse, so we don't want to rely on it. Just sub-class Action instead. Change-Id: Icfcc782cc334d1bc1d4940bec23af48ead692a9d
* | | Fix minor coding style issueMark McLoughlin2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | Use the same style of exception handling used everywhere else. Change-Id: I5436de1996f69ea6210f48c11ef231eb950ad21d
* | | Merge "Remove ConfigCliParser class"Jenkins2012-11-161-22/+6
|\ \ \
| * | | Remove ConfigCliParser classMark McLoughlin2012-11-151-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | This sub-class of ArgumentParser isn't really justified anymore. Change-Id: I705224b6e18e4609a8e2deba283767233b0bd578
* | | | Merge "Add support for positional arguments"Jenkins2012-11-162-51/+113
|\| | |
| * | | Add support for positional argumentsMark McLoughlin2012-11-152-51/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argparse makes it awkward to implement the current cfg API where we simply return the leftover arguments to the caller. Very few cfg users actually rely on this functionality and for those cases it probably makes more sense for them to explicitly register positional arguments or sub-parsers. Add support for positional arguments via a 'required' Opt attribute: opt = StrOpt('foo', positional=True) conf.register_cli_opt(opt) conf(['bar']) conf.foo == 'bar' Change-Id: Iea746d710237e1ea26c1ef4871643941d1df09bd
* | | | Merge "Use stock argparse behaviour for optional args"Jenkins2012-11-162-3/+2
|\| | |
| * | | Use stock argparse behaviour for optional argsMark McLoughlin2012-11-152-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optparse would print "Options" but argparse prints "optional arguments". The default argparse behaviour is fine, let's stick with that. Change-Id: Ib53a2581af9d776e9a7c1cd90eebe89b70034e57
* | | | Merge "Use stock argparse --usage behaviour"Jenkins2012-11-162-25/+3
|\| | |
| * | | Use stock argparse --usage behaviourMark McLoughlin2012-11-152-25/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optparse would substitute the program name for %prog, but argparse requires %(prog)s. Also, optparse would print 'Usage:' whereas argparse prints 'usage:'. Neither optparse behaviour that's worth retaining, let's just use the default argparse behaviour. Change-Id: Ied2acb37c366f1a45aed72b6b76f11e2de23828e
* | | | 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>