lp:~rlucio/nova/lp690314

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 512

Eric Day: Pending requested 2011-01-03

Devin Carlen: Pending requested 2011-01-03

Diff: 28 lines (+6/-1)

2 files modified

nova/db/sqlalchemy/session.py (+3/-1)
nova/flags.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #690314: Nova sqlalchemy mysql db connection timeout causes a 500 error

Low

Fix Released

Link a bug report

Related blueprints

506. By Ryan Lucio on 2011-01-03

removed extra whitespace chars at the end of the changed lines

505. By Ryan Lucio on 2010-12-31

Converted the pool_recycle setting to be a flag with a default of 3600 seconds

504. By Ryan Lucio on 2010-12-29

Add the pool_recycle setting to enable connection pooling features for the sql engine. The setting is hard-coded to 3600 seconds (one hour) per the recommendation provided on sqlalchemy's site

503. By Ryan Lucio on 2010-12-29

This branch fixes an issue where VM creation fails because of a missing flag definition for 'injected_network_template'. See Bug #695467 for more info.

502. By Matt Dietz on 2010-12-29

Changes and error fixes to help ensure basic parity with the Rackspace API. Some features are still missing, such as shared ip groups, and will be added in a later patch set.

501. By Ewan Mellor on 2010-12-29

Bug #694880: nova-compute now depends upon Cheetah even when not using libvirt

Only import Cheetah when needed, as we do already with libvirt and libxml2. This ensures that users of other virt backends don't need Cheetah to run nova-compute.

Resubmitted with pep8 violations fixed.

500. By Soren Hansen on 2010-12-28

Address bug #695157 by using a blank request class and setting an empty request path.

This fixes the test suite in environments with webob >= 1.0 (e.g. Ubuntu Natty).

(Thanks for Greg Holt for the suggestion)

499. By Cory Wright on 2010-12-28

This commit introduces scripts to apply XenServer host networking protections.

498. By Ewan Mellor on 2010-12-28

Bug #694890: run_tests.sh sometimes doesn't pass arguments to nosetest

Change the argument parsing in run_tests.sh so that we explicitly gather
the arguments that aren't meant for run_tests.sh, and pass them on to
nosetests.

497. By Trey Morris on 2010-12-28

I've added suspend along with a few changes to power state as well. I can't imagine suspend will be controversial but I've added a new power state for "suspended" to nova.compute.power_states which libvirt doesn't use and updated the xenapi power mapping to use it for suspended state. I also updated the mappings in nova.api.openstack.servers to map PAUSED to "error" and SUSPENDED to "suspended". Thoughts there are that we don't currently (openstack API v1.0) use pause, so if somehow an instance were to be paused an error occurred somewhere, or someone did something in error. Either way asking the xenserver host for the status would show "paused". Support for more power states needs to be added to the next version of the openstack API.

merge notes:
merge with trunk went well locally
unittests passed locally
testing of suspend succeeded locally

Notes for testing:
Suspending an instance requires PV drivers.
If using the cloudservers API, suspend and resume are not implemented. I tested by modifying in place nova.api.openstack.servers after pulling my branch. I made pause() and unpause() immediately return self.suspend() and self.resume(). Afterwards cloudserver pause (id) and cloudserver unpause (id) will perform the suspend/resume, and you can watch the compute worker log for info on what is happening.

SAMPLE LOG OUTPUT FOR PAUSE/UNPAUSE +++++++++++++++++++++
DEBUG:root:instance 1178831109: pausing
INFO:root:Task OpaqueRef:ba3b1595-0d70-574a-aaca-27442d04be87 status: success.
INFO:root:(VM_UTILS) xenserver vm state -> |Paused|
INFO:root:(VM_UTILS) xenapi power_state -> |3|
DEBUG:root:instance 1178831109: unpausing
INFO:root:Task OpaqueRef:2d9cb792-0ce5-be23-6c50-3dc52cf1535c status: success.
INFO:root:(VM_UTILS) xenserver vm state -> |Running|
INFO:root:(VM_UTILS) xenapi power_state -> |1|

SAMPLE LOG OUTPUT FOR SUSPEND/RESUME +++++++++++++++++++++
DEBUG:root:instance 1178831109: suspending
INFO:root:Task OpaqueRef:bc5d51da-922f-c9fb-f07c-aaa027fde601 status: success.
INFO:root:(VM_UTILS) xenserver vm state -> |Suspended|
INFO:root:(VM_UTILS) xenapi power_state -> |7|
DEBUG:root:instance 1178831109: resuming
INFO:root:Task OpaqueRef:4e5a3af8-baed-c144-30ea-63637390f6c8 status: success.
INFO:root:(VM_UTILS) xenserver vm state -> |Running|
INFO:root:(VM_UTILS) xenapi power_state -> |1|