Merge "Avoid update resource if compute node not updated"

1 files changed, 5 insertions, 0 deletions

diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py
index 0d79b9001f..a4573aef4b 100644
--- a/nova/scheduler/host_manager.py
+++ b/nova/scheduler/host_manager.py
@@ -181,6 +181,11 @@ class HostState(object):
 
     def _update_from_compute_node(self, compute):
         """Update information about a host from a ComputeNode object."""
+        # NOTE(jichenjc): if the compute record is just created but not updated
+        # some field such as free_disk_gb can be None
+        if compute.updated_at is None:
+            return
+
         if (self.updated and compute.updated_at
                 and self.updated > compute.updated_at):
             return