Merge lp:~jk0/nova/lp760342 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Added missing metadata join to instance_get calls.

[Ed Leafe (ed-leafe)]

lgtm

review: Approve

[Rick Harris (rconradharris)]

Looks great, Josh.

Any chance we could write a test to cover this class of problems; for example, verifying that all instance relationships are accessible without triggering SA errors? (Perhaps with an eye to extending this to all models in the future...)

[Josh Kearney (jk0)]

> Any chance we could write a test to cover this class of problems; for example,
> verifying that all instance relationships are accessible without triggering SA
> errors? (Perhaps with an eye to extending this to all models in the future...)

Unfortunately I don't think I'll be able to for a couple reasons:

1) There's currently no DB testing suite (it's all faked), and I wouldn't have time to write that this week during the ending of our Sprint cycle.

2) I'm unable to reproduce this bug after spinning a clean build environment. My thoughts are that it was a one-off situation in our environment that triggered this exception.

[Rick Harris (rconradharris)]

lgtm

review: Approve

[Josh Kearney (jk0)]

I filed a bug (which should probably be a BP) for the lack of DB testing in Nova: https://bugs.launchpad.net/nova/+bug/784184

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-05-16 20:51:08 +0000
+++ nova/db/sqlalchemy/api.py	2011-05-16 22:45:33 +0000
@@ -873,6 +873,7 @@
                    options(joinedload_all('fixed_ip.floating_ips')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ip.network')).\
+                   options(joinedload('metadata')).\
                    options(joinedload('instance_type')).\
                    filter_by(deleted=can_read_deleted(context)).\
                    all()
@@ -885,6 +886,7 @@
                    options(joinedload_all('fixed_ip.floating_ips')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ip.network')).\
+                   options(joinedload('metadata')).\
                    options(joinedload('instance_type')).\
                    filter_by(deleted=can_read_deleted(context)).\
                    filter_by(user_id=user_id).\