Merge lp:~itohm/nova/lp735974 into lp:~hudson-openstack/nova/trunk

[Masanori Itoh]

Added synchronize_session parameter to a query in fixed_ip_disassociate_all_by_timeout() and fix #735974.

[Jay Pipes (jaypipes)]

Hi!

The synchronize_session parameter is good, thanks!

However, it looks like that update should also be setting the updated_at column as well, no?

So, could you add it, like so:

update('instance_id': None,
       'leased': 0,
       'updated_at', datetime.datetime.utcnow()}, synchronize_session='fetch')

When running update() form a Query object in SQLalchemy, the normal before_update() hooks that would normally set updated_at automatically are not fired, which is why I believe the manual setting of updated_at is necessary.

Cheers!
jay

review: Needs Fixing

[lp:~itohm/nova/lp735974]

922. By Masanori Itoh on 2011-04-01

Rebased to trunk 726.

923. By Masanori Itoh on 2011-04-01

Rebased to trunk 930.

924. By Masanori Itoh on 2011-04-01

Added updated_at field to update statement according to Jay's comment.

[Masanori Itoh (itohm)]

Hi Jay,

Thanks a lot!
I added 'updated_at' field to the update statement, checked nova-network log and did run_tests.sh. Also rebased to trunk rev 930.
Hope this looks good for people. :)

-Masanori

> Hi!
>
> The synchronize_session parameter is good, thanks!
>
> However, it looks like that update should also be setting the updated_at
> column as well, no?
>
> So, could you add it, like so:
>
> update('instance_id': None,
> 'leased': 0,
> 'updated_at', datetime.datetime.utcnow()}, synchronize_session='fetch')
>
> When running update() form a Query object in SQLalchemy, the normal
> before_update() hooks that would normally set updated_at automatically are not
> fired, which is why I believe the manual setting of updated_at is necessary.
>
> Cheers!
> jay

[Jay Pipes (jaypipes)]

awesome :) thanks for that fix! lgtm now

review: Approve

[Vish Ishaya (vishvananda)]

LGTM. I can't actually reproduce the random error message, but this fix seems fine regardless.

review: Approve

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-03-25 14:21:03 +0000
+++ nova/db/sqlalchemy/api.py	2011-04-01 15:43:30 +0000
@@ -660,7 +660,9 @@
                      filter(models.FixedIp.instance_id != None).\
                      filter_by(allocated=0).\
                      update({'instance_id': None,
-                             'leased': 0})
+                             'leased': 0,
+                             'updated_at': datetime.datetime.utcnow()},
+                             synchronize_session='fetch')
     return result