openstack
/
nova
Code Issues Proposed changes

Remove eventlet hub workaround for monotonic clock 

The fix landed in eventlet in 0.21.0

Change-Id: Icf7d671bc5d3f32831e6867c297e838f984d81b6
This commit is contained in:
Matthew Booth 2019-03-15 18:20:26 +00:00 committed by Stephen Finucane
parent 86674279b0
commit bcfa24a09b
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -22,7 +22,7 @@ deprecation==2.0
dogpile.cache==0.6.5
enum34==1.0.4
enum-compat==0.0.2
eventlet==0.20.0
eventlet==0.21.0
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0

8
nova/monkey_patch.py
View File

@ -66,14 +66,6 @@ def _monkey_patch():
import threading
orig_threading.current_thread.__globals__['_active'] = threading._active
# 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)
# NOTE(mdbooth): This was fixed in eventlet 0.21.0. Remove when bumping
# eventlet version.
import oslo_service # noqa
eventlet.hubs.use_hub("oslo_service:service_hub")
# NOTE(mdbooth): Log here instead of earlier to avoid loading oslo logging
# before monkey patching.
# NOTE(mdbooth): Ideally we would raise an exception here, as this is

2
requirements.txt
View File

@ -5,7 +5,7 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
SQLAlchemy>=1.2.19 # MIT
decorator>=3.4.0 # BSD
eventlet!=0.20.1,>=0.20.0 # MIT
eventlet>=0.21.0 # MIT
Jinja2>=2.10 # BSD License (3 clause)
keystonemiddleware>=4.20.0 # Apache-2.0
lxml!=3.7.0,>=3.4.1 # BSD