6a56ec63bf
eventlet's hub mechanism defaults to using time.time for figuring out how long to sleep, when to wake up etc: https://github.com/eventlet/eventlet/blob/master/eventlet/hubs/epolls.py#L37 https://github.com/eventlet/eventlet/blob/master/eventlet/hubs/hub.py#L344 So if you mess with the system time, anything using loopingcall will stop working. Best example as described in the bug is `nova-manage service list` which fails for some services when the clock is advanced. If we use a monotonic timer, then we can get past this problem. In this review we use the EVENTLET_HUB hook to specify a custom Hub. In our custom Hub, we just delegate to the existing hub mechanism (get_default_hub()) to create an instance of the Hub and override the clock with one based on monotonic. Note that use_hub() mechanism will not work because that sets the Hub just for the current thread and will not work for other threads that may be started later. In order to set this environment variable early, we set it in the __init__.py so anyone who uses oslo service will enable this support just by a simple import referencing anything in oslo.service Co-Authored-By: Victor Stinner <vstinner@redhat.com> Closes-Bug: 1510234 Change-Id: I4c1cf223e9f6faa1e6dcaf432be1aa709072a343
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
|
|
import eventlet.patcher
|
|
import monotonic
|
|
from oslo_log import log as logging
|
|
|
|
time = eventlet.patcher.original('time')
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
if hasattr(time, 'monotonic'):
|
|
# Use builtin monotonic clock, Python 3.3+
|
|
_monotonic = time.monotonic
|
|
else:
|
|
_monotonic = monotonic.monotonic
|
|
|
|
|
|
def service_hub():
|
|
# NOTE(dims): Add a custom impl for EVENTLET_HUB, so we can
|
|
# override the clock used in the eventlet hubs. The default
|
|
# uses time.time() and we need to use a monotonic timer
|
|
# to ensure that things like loopingcall work properly.
|
|
hub = eventlet.hubs.get_default_hub().Hub()
|
|
hub.clock = _monotonic
|
|
return hub
|
|
|
|
|
|
os.environ['EVENTLET_HUB'] = 'oslo_service:service_hub'
|