From 7caf4f39db2df77c2cfdb21eb4c71255288bb71f Mon Sep 17 00:00:00 2001 From: joey5678 Date: Thu, 23 Oct 2014 17:25:55 +0800 Subject: [PATCH] Add delay time for sync between cascading and cascaded vm status Change-Id: I6dc4e9ded698db46103d8ce218307d10728f4b72 --- novaproxy/nova/compute/manager_proxy.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/novaproxy/nova/compute/manager_proxy.py b/novaproxy/nova/compute/manager_proxy.py index 63115736..609b7520 100644 --- a/novaproxy/nova/compute/manager_proxy.py +++ b/novaproxy/nova/compute/manager_proxy.py @@ -1,5 +1,6 @@ import base64 import contextlib +import datetime import functools import os import sys @@ -555,6 +556,7 @@ class ComputeManager(manager.Manager): @periodic_task.periodic_task(spacing=CONF.sync_instance_state_interval, run_immediately=True) def _heal_instance_state(self, context): + time_shift_tolerance = 3 heal_interval = CONF.sync_instance_state_interval if not heal_interval: return @@ -586,7 +588,12 @@ class ComputeManager(manager.Manager): } servers = cascadedNovaCli.servers.list( search_opts=search_opts_args) - self._change_since_time = timeutils.isotime() + LOG.debug(_('the current time is %s'), timeutils.utcnow()) + _change_since_time = timeutils.utcnow() - \ + datetime.timedelta(seconds=time_shift_tolerance) + self._change_since_time = timeutils.isotime(_change_since_time) + LOG.debug(_('the change since time is %s'), + self._change_since_time) if len(servers) > 0: LOG.debug(_('Updated the servers %s '), servers)