summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Allow rpc drivers to always be imported"Jenkins2013-01-152-10/+20
|\
| * Allow rpc drivers to always be importedMark McLoughlin2013-01-152-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qpid and zmq drivers current can't be import unless their respective libraries are installed and neither are currently listed in test-requires. This prevents us from being able to use nosetests --with-doctests because the import failure is seen as a test failure. Fix this issue by making the import always succeed and deferring failure until the module's APIs are actually used. This will also help Nova's sample config file generation since it will allow the generate-sample tool discover config options for these drivers even when the messaging libraries aren't installed. Change-Id: I30087fd33eef41d50d1a374cb5694dc15c43d1da
* | Merge "Rework zmq setup and cleanup"Jenkins2013-01-152-27/+18
|\|
| * Rework zmq setup and cleanupMark McLoughlin2013-01-152-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register config options at import time and remove the register_opts() function. It seems this isn't being used. Add accessor methods for ZMQ_CTXT and matchmaker so that they are lazily created rather than created at import time. Remove the rpc_zmq_matchmaker override in the tests since MatchMakerLocalhost is the default anyway. We were setting it with an incorrect value, but only after the matchmaker had already been created. Change-Id: I2520252c64d70e4c4903e34d07952fed43e70ebe
* | Merge "Fix zmq socket.close() with eventlet 0.9.17"Jenkins2013-01-151-3/+7
|\ \
| * | Fix zmq socket.close() with eventlet 0.9.17Eric Windisch2013-01-131-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug/change in eventlet 0.9.17 blocks the kwargs from close() from passing through to pyzmq. As this code was only explicitly passing defaults, no argument is necessary. This addresses file descriptor leaks reported in bug 1099185. This bug does not affect installations with eventlet<=0.9.16 The code will now log an error if a socket cannot be closed. Change-Id: Id438dab9744042328b7fac44693d02e116d8c1d9
* | | Merge "Don't include versioninfo in manifest."Jenkins2013-01-151-1/+0
|\ \ \ | |_|/ |/| |
| * | Don't include versioninfo in manifest.Monty Taylor2013-01-141-1/+0
| |/ | | | | | | | | | | | | We don't produce versioninfo files anymore, so don't try to include them in the MANIFEST.in. Change-Id: I00d8a61361cba73528a1ae780538a80ed1da2361
* | Merge "Add missing parameter to impl_fake notify function."Jenkins2013-01-151-1/+1
|\ \
| * | Add missing parameter to impl_fake notify function.Gary Kotton2013-01-141-1/+1
| |/ | | | | | | | | | | The envelope was missing. Change-Id: I3ab8f573e6c5020bd564ad78de29e6c285695f2c
* | Merge "Implement importutils.try_import."Jenkins2013-01-154-3/+18
|\ \
| * | Implement importutils.try_import.Dan Prince2013-01-144-3/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new (simple) importutils.try_import function which can return a module name or a default (by default this is None). This should help clean up some of our try: import foo except... blocks in modules. This commit also drops the dependency on python-extras which is no longer needed. Fixes LP Bug #1099501. Change-Id: I8591f79983bdad67a50d1aaae6dce8428dfce084
* | Merge "reusable ZmqProxy service initialization"Jenkins2013-01-153-48/+35
|\ \
| * | reusable ZmqProxy service initializationEric Windisch2013-01-133-48/+35
| |/ | | | | | | | | | | | | | | | | | | | | Move near-identical proxy setup code from oslo-zmq-receiver and test_zmq into ZmqProxy's consume_in_thread method Provides code reuse and simplifies the tests and receiver binary. Change-Id: I1324eacfa2a456599d5fd462b6476ddf659e95c4
* | Merge "call() to accept serialize and force_envelope"Jenkins2013-01-151-3/+6
|\ \ | |/ |/|
| * call() to accept serialize and force_envelopeEric Windisch2013-01-101-3/+6
| | | | | | | | | | | | | | | | | | | | The serialize and force_envelope options were being stripped from call(). Now, when call() is invoked, these options are passed and respected. Change-Id: I69355606b06ab2ec87765fe6ddba7baaa68e5754
* | Merge "Verbose should not enable debug level logging"Jenkins2013-01-133-5/+15
|\ \
| * | Verbose should not enable debug level loggingDavanum Srinivas2013-01-123-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP #989269 Currently setting --verbose in will still allow DEBUG level message to be logged to python logger object. we need to check for --debug first (set DEBUG level), then --verbose (set INFO level) and if neither is set then set default to WARNING DocImpact Change-Id: Ic9e3cb5979b2d7283552ad3a461870373f45a239
* | | Merge "Upgrade WebOb to 1.2.3"Jenkins2013-01-121-1/+1
|\ \ \
| * | | Upgrade WebOb to 1.2.3Doug Hellmann2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of WebOb being used in OpenStack was more than 1 year old. This change updates to the latest stable release. Upgrading WebOb resolves a version conflict between OpenStack and Pecan, the web framework used by the Ceilometer team for version 2 of the ceilometer API. Refer to http://docs.webob.org/en/latest/news.html for the list of changes between 1.0.8 and 1.2.3. bug 1092227 Change-Id: I2c8e95ecc3b69b40fd9f8d2f801e75c17b07ed59 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | | Merge "zmq-receiver msg forwarding in greenthreads"Jenkins2013-01-121-20/+48
|\ \ \ \
| * | | | zmq-receiver msg forwarding in greenthreadsEric Windisch2013-01-101-20/+48
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because PUSH sockets can block and there may not be PULL consumers, the oslo-zmq-receiver process may stall in certain senarios. Improves error handling in ZmqProxy. This addresses bug 1097856. Additionally, this bug seems to improve (but not necessarily fix) the behavior reported in bug 1065532. Change-Id: I6df6035a6676c5bcdddaec7a332ac77e621ba9f3
* | | | Merge "Improve millisecond logging"Jenkins2013-01-121-3/+3
|\ \ \ \
| * | | | Improve millisecond loggingJoe Gordon2013-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always display 3 digits for milliseconds (appends 0s) Change-Id: I3f1461839258be0723e2d3616ec225a830d13029
* | | | | Merge "Log when release file lock"Jenkins2013-01-121-0/+5
|\ \ \ \ \
| * | | | | Log when release file lockJoe Gordon2013-01-091-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We log when waiting for a file lock, when getting one, so lets log when releasing one. Change-Id: I1838c424fda74c04e9c2107db08226670e8372f3
* | | | | Merge "Fix pep8 E125 errors."Jenkins2013-01-126-18/+18
|\ \ \ \ \
| * | | | | Fix pep8 E125 errors.Monty Taylor2013-01-116-18/+18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Caesar's wife must be above reproach. Change-Id: Iac85a57e71d403360f1567c07c8699057f0772fb
* | | | | Merge "Simplify version processing."Jenkins2013-01-125-203/+70
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Simplify version processing.Monty Taylor2013-01-115-203/+70
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In response to the cessation of per-commit tarballs produced by the CI systems, simplify the version processing code. We did many many many complicated things to support producing release artifacts that were not actually supported release artifacts. After a bunch of issues emerged, it was determined that the best way forward was to stop producing quasi-not-really non-release tarballs. If people want to consume versions of openstack that are not released versions, the git repos are always available. Additionally, this patch removes versioninfo and just uses PKG-INFO and pkg_resources to handle version processing. Change-Id: I5c799f3520adb2ba5288d852543706d81a92f8a1
* / / / Address test_zmq setup/teardown racesEric Windisch2013-01-101-16/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each test now consumes a new port number (9500+), and socket directory based on an auto-incrementing global counter (TESTCNT). Also makes minor cleanup to test receiver setup logic. fixes bug 1096223 Change-Id: Ie6a88c535c81f2fc12b97d32c2674a6184325d2a
* / / Revert "Support lookup of value using "group.key""Mark McLoughlin2013-01-082-11/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 525ac47. There are already two ways to reference an option in a group: CONF.group.key CONF[group].key Adding a third variant doesn't seem ideal. Also, for the specific case of LazyPluggable in Nova, we can easily just pass an optional config group name to the constructor. Change-Id: I1a29a18d90e8af3ce2563bd1b3eeb64422140016
* | Merge "Add zmq receiver binary"Jenkins2013-01-081-0/+76
|\ \
| * | Add zmq receiver binaryEric Windisch2013-01-081-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | The impl_zmq rpc driver requires a binary running on all hosts. Previously residing in nova, this binary is being moved into oslo-incubator. Change-Id: I3f38374b71794029550147ed4fc75f0fd63adf75
* | | Merge "Use package for writing versioninfo."Jenkins2013-01-081-2/+2
|\ \ \
| * | | Use package for writing versioninfo.Steve Baker2013-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently fails for client projects as python_package is the name of the project, while package is where versioninfo is written to. This doesn't affect server openstack projects because python_package == package. This hasn't affected any client projects yet because most likely none of them call version.canonical_version_string() in their setup.py Change-Id: Ia97e5fae378c47909f3dbc842dc83e408af68671
* | | | Merge "Fix publish_errors unit test"Jenkins2013-01-081-8/+9
|\ \ \ \
| * | | | Fix publish_errors unit testMark McLoughlin2013-01-031-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit test for publish_errors=True causes logging to be spewed from other tests because it configures the default root logger rather than creating its own logger like other logging tests do. This makes the unit tests completely silent again. Also, it hooked into the rpc notifier to catch notifications when it can simple hook into the no-op notifier like other tests. Finally, it used stubout to override the value of config options rather than the BaseTestCase.config() helper method. Change-Id: I13313fcd9ad8f9e5bcb9af90652b5dde5c3feec9
* | | | | Merge "JSONDictSerializer encode objects to unicode"Jenkins2013-01-082-1/+12
|\ \ \ \ \
| * | | | | JSONDictSerializer encode objects to unicodeSean McCully2013-01-032-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Averts raising ValueError, Circular Reference Detected exception. Add additional test to JSONDictSerializerTest testing that JSONDictSerializer correctly serializes objects into unicode repr. and not raise error Fixes: bug #1089100 Change-Id: Ifdb0562c7c43ab66617dddb65f16f893df2f4895
* | | | | | Merge "rpc method arguments should be dict, not list"Jenkins2013-01-082-15/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | rpc method arguments should be dict, not listEric Windisch2013-01-082-15/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default arguments were being set to a list instead of a dict. This caused problems if the args key was missing in the msg argument to the call/cast methods. Adds tests to check if RPC cast/call work without arguments. Changes and documents the _test_cast method arguments, allowing for more flexibility and code reuse. fixes bug 1089750 Change-Id: I854dc3fcad8936695feb4414f3862672cf98c5d1
* | | | | Merge "Support lookup of value using "group.key""Jenkins2013-01-082-1/+11
|\ \ \ \ \
| * | | | | Support lookup of value using "group.key"Davanum Srinivas2013-01-022-1/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let us check if the opt_name has a '.', if it does then split it into a group/key and try lookup using that combination. Since LazyPluggable uses "CONF[self.__pivot]" if we just add this capability to cfg, we get "LazyPluggable doesn't support option groups" for free. Fixes LP #1093043 Change-Id: I9cedcf22014038e9fe4ed5e66ca5427aa99b5091
* | | | | Merge "Fix serialization in impl_zmq."Jenkins2013-01-081-7/+30
|\ \ \ \ \
| * | | | | Fix serialization in impl_zmq.Russell Bryant2013-01-071-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the rpc message envelope patch went in, the serialization done in impl_zmq was replaced with what is done in rpc.common. Instead, it just needs to be done as an additional stage of serialization. The reason is that the amqp drivers can handle passing dicts into the messaging libraries. The zeromq library can not handle that, so it has to ensure it is a string before passing it down to the library. This patch restores the original (unmodified) _serialize() and _deserialize() methods in impl_zmq that were removed and calls them as appropriate. Change-Id: I09cac780c9a9b15390229c63d71e360120548b3d
* | | | | | Merge "Make WebOb version specification more flexible"Jenkins2013-01-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Make WebOb version specification more flexibleDoug Hellmann2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the WebOb version to >=1.0.8 as an temporary measure to allow the actual version update to 1.2.3 to roll out across the projects one at a time without breaking the integration tests. Change-Id: Ie08a97a31eaae0b1245b94f85e0f926512e4d513 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | | | Merge "Close kombu.connection.BrokerConnection correctly"Jenkins2013-01-071-1/+1
|\ \ \ \ \
| * | | | | Close kombu.connection.BrokerConnection correctlyHengqing Hu2012-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make kombu.connection.BrokerConnection use release() to close the connection. It has no such attribute as close(), since AttributeError is in connection_errors, the fault was previous concealed by the following catch statement. Change-Id: I9f7da2c64f9d408aa2a9ddf723ea83291887cff6
generated by cgit (git 2.34.1) at 2024-07-02 13:12:51 +0000