diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-07 15:55:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-07 15:55:22 +0000 |
| commit | 4d4cddbb9aeb26fe8d9831f20553f04e8cf29c44 (patch) | |
| tree | 6affe32a396ae1b389c8d8f71c795ced2bc450d1 | |
| parent | a2f260fff8810976f31b0d01586e3f691c25abb8 (diff) | |
| parent | fad69df25ffcea2a44cbf3ef636a68863a2d64d9 (diff) | |
| download | nova-4d4cddbb9aeb26fe8d9831f20553f04e8cf29c44.tar.gz nova-4d4cddbb9aeb26fe8d9831f20553f04e8cf29c44.tar.xz nova-4d4cddbb9aeb26fe8d9831f20553f04e8cf29c44.zip | |
Merge "Handle compute node records with no timestamp."
| -rw-r--r-- | nova/scheduler/host_manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index 0c64d7aa2..d5b8aeb52 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -140,7 +140,8 @@ class HostState(object): def update_from_compute_node(self, compute): """Update information about a host from its compute_node info.""" - if self.updated and self.updated > compute['updated_at']: + if (self.updated and compute['updated_at'] + and self.updated > compute['updated_at']): return all_ram_mb = compute['memory_mb'] |