summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-01 17:43:12 +0000
committerTarmac <>2011-04-01 17:43:12 +0000
commit84dd5b0c94a8fdf3ec906c49de89331a0cb88444 (patch)
tree10f1bca81fd67d3c8cb2adcdde5dff6baffd1620
parentb09e6b7d7a6fb2966d6d215588ed45bd6003f345 (diff)
parent007992e57c064c90e6a09f8dac070d3b56dc72a0 (diff)
downloadnova-84dd5b0c94a8fdf3ec906c49de89331a0cb88444.tar.gz
nova-84dd5b0c94a8fdf3ec906c49de89331a0cb88444.tar.xz
nova-84dd5b0c94a8fdf3ec906c49de89331a0cb88444.zip
Added synchronize_session parameter to a query in fixed_ip_disassociate_all_by_timeout() and fix #735974.
-rw-r--r--nova/db/sqlalchemy/api.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index b2a13a01b..6da8dac10 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -660,7 +660,9 @@ def fixed_ip_disassociate_all_by_timeout(_context, host, time):
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