diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-23 04:24:54 -0500 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-23 04:24:54 -0500 |
| commit | 08622cb48c200aa27e214fb14e47a741069b9bb0 (patch) | |
| tree | a5cf629e76889dce177f6056bb6a544e8236ba1e | |
| parent | ce0a9b7b36ba816c347f10a1804aedf337ad35da (diff) | |
| download | nova-08622cb48c200aa27e214fb14e47a741069b9bb0.tar.gz nova-08622cb48c200aa27e214fb14e47a741069b9bb0.tar.xz nova-08622cb48c200aa27e214fb14e47a741069b9bb0.zip | |
All timestamps should be in UTC. Without this patch, the scheduler unit tests fail for anyone sufficiently East of Greenwich.
| -rw-r--r-- | nova/scheduler/driver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 2e6a5a835..c89d25a47 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -42,7 +42,8 @@ class Scheduler(object): def service_is_up(service): """Check whether a service is up based on last heartbeat.""" last_heartbeat = service['updated_at'] or service['created_at'] - elapsed = datetime.datetime.now() - last_heartbeat + # Timestamps in DB are UTC. + elapsed = datetime.datetime.utcnow() - last_heartbeat return elapsed < datetime.timedelta(seconds=FLAGS.service_down_time) def hosts_up(self, context, topic): |