diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-05-23 22:17:35 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-05-25 09:22:33 +0800 |
| commit | 5aca2e2df66c124696589ed3d45aae218fe2c91e (patch) | |
| tree | 0f8647502eb70ae02b460a52410e1f0cc8c171c4 /nova/db | |
| parent | 709d49e9791751911635a923971d8f17757a97cf (diff) | |
Use utils.utcnow rather than datetime.utcnow
Fixes bug #1003587
Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow
Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 5386b0f41..9f43d1045 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1592,8 +1592,7 @@ def instance_get_floating_address(context, instance_id): @require_admin_context def instance_get_all_hung_in_rebooting(context, reboot_window, session=None): - reboot_window = datetime.datetime.utcnow() - datetime.timedelta( - seconds=reboot_window) + reboot_window = utils.utcnow() - datetime.timedelta(seconds=reboot_window) if not session: session = get_session() @@ -3775,8 +3774,8 @@ def migration_get_by_instance_and_status(context, instance_uuid, status): @require_admin_context def migration_get_all_unconfirmed(context, confirm_window, session=None): - confirm_window = datetime.datetime.utcnow() - datetime.timedelta( - seconds=confirm_window) + confirm_window = (utils.utcnow() - + datetime.timedelta(seconds=confirm_window)) return model_query(context, models.Migration, session=session, read_deleted="yes").\ |