Make eventlet hub use a monotonic clock

If system time is adjusted first forward and then backward while a
masakari-engine service is running, then the periodic tasks stops
for the duration of time the system clock was adjusted backward.

This was supposed to be fixed by the following patch to oslo.service
https://review.openstack.org/#/c/286838/ , but the order of imports
in unit tests and production code is different, so masakari services
end up starting with the default eventlet hub, that does not use a
monotonic clock and, thus, is affected by changes of system time.

Testing the change done in the patch is problematic, as it's a
subject of imports order and is not reproduced in functional or
unit tests (oslo_service is always imported earlier than eventlet
hub is initialized, so it just does "the right thing").
The alternative is to make an assertion when services start.

Co-Authored-By: Roman Podoliaka <rpodolyaka@mirantis.com>
Closes-Bug: #1510234
Change-Id: I9d917b3151d9cdf7340a173b5baf98def63c76cd
This commit is contained in:
Dinesh Bhor 2017-09-13 16:12:33 +05:30 committed by Sampath Priyankara (samP)
parent 57bbe7dead
commit 2c4574bfdc
2 changed files with 17 additions and 0 deletions

View File

@ -26,4 +26,9 @@ import os
os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
# NOTE(rpodolyaka): import oslo_service first, so that it makes eventlet hub
# use a monotonic clock to avoid issues with drifts of system time (see
# LP 1510234 for details)
import oslo_service # noqa
import eventlet # noqa

View File

@ -41,6 +41,17 @@ LOG = logging.getLogger(__name__)
CONF = masakari.conf.CONF
def assert_eventlet_uses_monotonic_clock():
import eventlet.hubs as hubs
import monotonic
hub = hubs.get_hub()
if hub.clock is not monotonic.monotonic:
raise RuntimeError(
'eventlet hub is not using a monotonic clock - '
'periodic tasks will be affected by drifts of system time.')
class Service(service.Service):
"""Service object for binaries running on hosts.
@ -78,6 +89,7 @@ class Service(service.Service):
}
def start(self):
assert_eventlet_uses_monotonic_clock()
verstr = version.version_string_with_package()
LOG.info('Starting %(topic)s (version %(version)s)', {
'topic': self.topic,