summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | Refactor work with session in db.block_device_mapping_* methodsBoris Pavlovic2013-03-131-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit use of session where it is not required. Also this is small performance optimization, because if we put session parameter to Models.save() method will create subtransaction. blueprint db-session-cleanup Change-Id: I6064f3df2daf0178009c4cf40da293f71ca6972a
* | | | | | | | | | | | | | | | | | | | | Merge "Fix use of potentially-stale instance_type in tenant_usage"Jenkins2013-03-132-24/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix use of potentially-stale instance_type in tenant_usageDan Smith2013-03-132-24/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The simple_tenant_usage API extension may return incorrect billing information if a flavor is changed or deleted while an instance using it is still running. This makes it use the stashed instance_type instead. Fixes bug 1154707 Change-Id: Ifce33488e5ef8aa942051d882407a3e2d088aaf5
* | | | | | | | | | | | | | | | | | | | | Merge "Make run_instance() bail quietly if instance has been deleted"Jenkins2013-03-132-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Make run_instance() bail quietly if instance has been deletedDan Smith2013-03-122-2/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, we make a big mess in the logs if someone deletes an instance before we get a chance to run it. This cleans that up to a single warning message. Fixes bug 1154292 Change-Id: I2de0c2993d6a16d9482878eee4eef10bfd78c3e6
* | | | | | | | | | | | | | | | | | | | Merge "Virtual Power Driver list running vms quoting error"Jenkins2013-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Virtual Power Driver list running vms quoting errorChris Krelle2013-03-121-1/+1
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a issue with VPD when configured for virsh the list running vms function attempts to execute $2 instead of the actual command. Fixes Bug 1154280 Change-Id: I6d06cc58fb0f2935c4341761908b914106bda916 Authored-by: Chris Krelle <nobodycam@gmail.com>
* | | | | | | | | | | | | | | | | | | Merge "List ComputeHostNotFound as a client exception"Jenkins2013-03-132-18/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | List ComputeHostNotFound as a client exceptionHans Lindgren2013-03-132-18/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service_get_all_by() in nova.conductor.manager should list ComputeHostNotFound as a client exception for rpc. This to prevent the rpc layer from logging a traceback when this exception is raised. This is an expected type of exception that should be left to the client to handle. Resolves bug 1154597. Change-Id: I656e264526673fa10e47692903a5f30f813b479b
* | | | | | | | | | | | | | | | | | | | Merge "Add missing tests for db.block_device_mapping_* methods"Jenkins2013-03-132-1/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add missing tests for db.block_device_mapping_* methodsBoris Pavlovic2013-03-132-1/+148
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no tests in test_db_api for block_device_mapping_* methods. Add tests to ensure that all works. Also these tests allow us to refactor work with session in these methods. Fix bug in is_ephemeral we should return True or False not instance of _sre.SRE_Match or None. blueprint db-api-tests Change-Id: I3cac17e7d2c8d0b2608fb9a78ea29210f025222b
* | | | | | | | | | | | | | | | | | | Merge "Update to Quantum Client 2.2.0"Jenkins2013-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update to Quantum Client 2.2.0Aaron Rosen2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates tools/pip-requires to use the python-quantumclient 2.2 It also limits the version to <3.0.0 to prevent breaking something accidently when 3.0.0 is released. Fixes bug 1152695 Change-Id: Ic47deccac1df5a1b6b5171f1f7d80b250b57ebc9
* | | | | | | | | | | | | | | | | | | | Merge "Fix behaviour of split_cell_and_item"Jenkins2013-03-134-11/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix behaviour of split_cell_and_itemMatthew Sherborne2013-03-124-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to split a cell and item, with no path!to!cell@ in it, it'll now return None for the cell, instead causing a ValueError when trying to split the result. Change-Id: I228b9f3b0f63f8c7a6004b3206f5312ed2a878bc Fixes: bug #1153841
* | | | | | | | | | | | | | | | | | | | Merge "Prepare services index method for use with cells"Jenkins2013-03-133-9/+21
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Prepare services index method for use with cellsMatthew Sherborne2013-03-123-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the api.openstack.compute.contrib.services' index method's logic out of the openstack api layer and into the compute api layer. The addition of the availability_zone information is already done by the host api. For this reason it was removed from the openstack api layer. The behaviour of the call remains the same, only the functionality has been moved. This patch makes the functionality automatically work in cells. Work towards: bug #1150499 Change-Id: Ia9489f11608167aed5168ccb3b670f395f7de5f7
* | | | | | | | | | | | | | | | | | | Merge "Skip deleted fixed ip address for os-fixed-ips extension"Jenkins2013-03-132-17/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Skip deleted fixed ip address for os-fixed-ips extensionZhi Yan Liu2013-03-132-17/+45
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the correct fixed ip address info when the address record(s) marked 'deleted' in db. Fixes bug 1152958 Change-Id: I58ba47427753a81cd43eb618cff199c45f83322c Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | | | | | | | | | | | | | | Merge "Lazy load CONF.quota_driver."Jenkins2013-03-131-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Lazy load CONF.quota_driver.Chris Behrens2013-03-121-8/+13
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nova.quota is imported before config options are parsed and it looks at CONF.quota_driver on module-load. This changes it so we look at CONF.quota_driver post-module-load. Fixes bug 1154371 Change-Id: Ia2e63a7aeab2234be683ff507e7856d46601a9a8
* | | | | | | | | | | | | | | | | | | Merge "Fix reconnecting to libvirt."Jenkins2013-03-132-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix reconnecting to libvirt.Russell Bryant2013-03-132-2/+4
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The right logic was in place for dealing with losing a connection to libvirt and reconnecting. However, it was observed that we actually get VIR_ERR_INTERNAL_ERROR, VIR_FROM_RPC after restarting libvirtd. The code is just updated to deal with INTERNAL_ERROR. Fix bug 1154473. Change-Id: Idf4abf3fe485cf534f1732e4340fc35652fec003
* | | | | | | | | | | | | | | | | | | Merge "Sync rpc from oslo-incubator."Jenkins2013-03-137-25/+251
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Sync rpc from oslo-incubator.Russell Bryant2013-03-127-25/+251
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: * Fix Copyright Headers - Rename LLC to Foundation * Preserve exceptions in impl_zmq. * Don't log a traceback on rpc call timeout. * Redis-based matchmaker * AMQP: skip duplicate messages * some other minor fixes / cleanups Fix bug 1154232. Change-Id: I8afb6b9a919fca34b4a93f7fad1551a023eba6b2
* | | | | | | | | | | | | | | | | | Merge "Switch to final 1.1.0 oslo.config release"Jenkins2013-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Switch to final 1.1.0 oslo.config releaseMark McLoughlin2013-03-131-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1128256 oslo.config has now been released to PyPI in time for Grizzly RC1 so we can switch to using it directly. Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91
* | | | | | | | | | | | | | | | | | Merge "Fix nova-manage --version"Jenkins2013-03-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix nova-manage --versionMark McLoughlin2013-03-121-0/+2
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1138844 Pass the version kwarg to cfg.CONF() so that --version shows the version number. Change-Id: I589ebffec67ef00f8ba24f553bf3e81806aa50b6
* | | | | | | | | | | | | | | | | Merge "Pin SQLAlchemy to 0.7.x"Jenkins2013-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Pin SQLAlchemy to 0.7.xDirk Mueller2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0.7.10 has been released and is compatible with 0.7.x. Instead of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8 Change-Id: Iea57598698b4faf906e82a2974497221d07f4d16
* | | | | | | | | | | | | | | | | | Merge "Delete instance metadata when delete VM"Jenkins2013-03-132-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Delete instance metadata when delete VMJoe Gordon2013-03-122-1/+18
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * like everything else instance metadata is just soft deleted. * This doesn't soft delete instance_system_metadata (bug 1153827) Fix bug 1092408 Change-Id: Iebc2c7e055a110e5067829569127a272a1a92a87
* | | | | | | | | | | | | | | | | | Merge "Fix: Managers that incorrectly derive from SchedulerDependentManager"Jenkins2013-03-134-13/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix: Managers that incorrectly derive from SchedulerDependentManagerHans Lindgren2013-03-124-13/+8
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change conductor and network managers to be ordinary managers. Also remove some unnecessary imports from managers already declared with base manager classes in nova/manager.py. Resolves bug 1154070. Change-Id: I6b87cd5d7d5ef66425d084db667a6eff247cf0b1
* | | | | | | | | | | | | | | | | Merge "xenapi: Fix reboot with hung volumes"Jenkins2013-03-1212-18/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | xenapi: Fix reboot with hung volumesRick Harris2013-03-1112-18/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a volume becomes inoperable (e.g. the ISCSI connection is severed) and the user goes to reboot, the instance may enter a permanently halted state. The root cause is that a VBD that points to 'bad' volume prevents VM operations ('reboot', 'start') from completing under XenServer. The work around is to detect which volumes are bad, detach in the virt-layer, retry the operation (or in the case of reboot, just 'start' the halted instance), and then notify the compute manager via a callback so it can detach the volume in Cinder. Fixes bug 1148614 Change-Id: Id4e8e84bb5748cfa267c2a418f9405fd86829e8f
* | | | | | | | | | | | | | | | | | Merge "Fix: nova-manage throws uncaught exception on invalid host/service"Jenkins2013-03-122-10/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix: nova-manage throws uncaught exception on invalid host/serviceHans Lindgren2013-03-122-10/+28
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test case for this too. Fix bug 1154089. Change-Id: I3a60e581a9fac945fddf72c4f037ca5cae0005fc
* | | | | | | | | | | | | | | | | | Merge "Fix quota issues with instance deletes."Jenkins2013-03-129-126/+290
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix quota issues with instance deletes.Chris Behrens2013-03-119-126/+290
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to keep quotas in sync as much as possible, only commit quota changes for delete when: 1) An instance's vm_state is updated to be SOFT_DELETED. 2) The DB record is marked as deleted (and the instance's vm_state is not SOFT_DELETED) If a host is down and we delete the instance in the API, this means quotas are committed within the API. Otherwise, quotas are committed on the manager side. Fixes bug 1098380 Also needed for proper testing: Fixed compute cells tests so that pseudo child cells use NoopQuotaDriver. This uncovered inconsistencies in the NoopQuotaDriver wrt the DBQuotaDriver. Those issues were fixed as well. Change-Id: Ib72de1a457f0c5056d55a5c7dd4d8d7c69708996
* | | | | | | | | | | | | | | | | Merge "Compile BigInteger to INTEGER for sqlite"Jenkins2013-03-123-4/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Compile BigInteger to INTEGER for sqliteKaushik Chandrashekar2013-03-083-4/+82
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure BigInteger does not map to BIGINT for an auto-created sqlite registry DB, as this type is not supported by sqlite. Refactoring a test to use generic unsupported column type Fixes bug 1147879 Change-Id: I590c798dd470def286802bc6e00bb4b621332b8d
* | | | | | | | | | | | | | | | Merge "websockify 0.4 is busted"Jenkins2013-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | websockify 0.4 is bustedChris Behrens2013-03-121-1/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was just released and it is broken, stalling our gates. When attempting to install it, we get: "error: can't copy 'include/util.js': doesn't exist or not a regular file" Change-Id: I9d93bff92cc4a9d837382acce78bff587f52fb99
* | | | | | | | | | | | | | | Merge "Fixes nbd device can't be released error"Jenkins2013-03-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixes nbd device can't be released errorWangpan2013-03-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the 'mount' operation is successful but stderr is not empty during injecting key/file into image, there may be some warning messages output to stderr, so we need to discard them and continue to inject files into image. Fixes bug #1152519 Change-Id: Icc7d15196f3ee67674f9d815ddeef4378f363e2c
* | | | | | | | | | | | | | | Merge "Force resource updates to update updated_at"Jenkins2013-03-122-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Force resource updates to update updated_atChris Behrens2013-03-112-0/+11
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's no changes in resources, compute_node_update (and other DB update calls) won't modify 'updated_at'. 'updated_at' is what is used to invalidate the cache in the scheduler's host_manager. Because of a race with the compute manager, the scheduler could be out of sync with the compute_nodes table but have a newer time on its cache. By always updating 'updated_at' on resource updates, the periodic task will be sure to invalidate any bad cache the scheduler has. Fixes bug 1153778 Change-Id: I19b51a5b84f472cd0f4de6460a4edb540cc62da2
* | | | | | | | | | | | | | | Merge "Remove instance['instance_type'] relationship from db api"Jenkins2013-03-126-63/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \