Merge "Changes calcuation of variable delay"

1 files changed, 4 insertions, 4 deletions

diff --git a/openstack/common/loopingcall.py b/openstack/common/loopingcall.py
index f9e13866..862f8b94 100644
--- a/openstack/common/loopingcall.py
+++ b/openstack/common/loopingcall.py
@@ -82,12 +82,12 @@ class FixedIntervalLoopingCall(LoopingCallBase):
                     end = _ts()
                     if not self._running:
                         break
-                    delay = interval + start - end
-                    if delay <= 0:
+                    delay = end - start - interval
+                    if delay > 0:
                         LOG.warn(_LW('task %(func_name)s run outlasted '
                                      'interval by %(delay).2f sec'),
-                                 {'func_name': repr(self.f), 'delay': -delay})
-                    greenthread.sleep(delay if delay > 0 else 0)
+                                 {'func_name': repr(self.f), 'delay': delay})
+                    greenthread.sleep(-delay if delay < 0 else 0)
             except LoopingCallDone as e:
                 self.stop()
                 done.send(e.retvalue)