From b2a7fc348ad8d8e4ec11bfa06c288c26901167a2 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Wed, 12 Mar 2014 17:47:28 -0700 Subject: [PATCH] BigSwitch: Use eventlet.sleep in watchdog Changes the consistency watchdog that runs in the background to use eventlet.sleep instead of time.sleep to avoid blocking other members of the same pool. Closes-Bug: #1291695 Change-Id: I5ec842cca1063cef761c2cd09d63617baf27d191 --- neutron/plugins/bigswitch/servermanager.py | 3 +-- neutron/tests/unit/bigswitch/test_servermanager.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index 5efafed7e5..86b087f97d 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -37,7 +37,6 @@ import json import os import socket import ssl -import time import eventlet from oslo.config import cfg @@ -551,7 +550,7 @@ class ServerPool(object): # rest call and the consistency header will be added. If it # doesn't match, the backend will return a synchronization error # that will be handled by the rest_call. - time.sleep(polling_interval) + eventlet.sleep(polling_interval) self.rest_call('GET', HEALTH_PATH) diff --git a/neutron/tests/unit/bigswitch/test_servermanager.py b/neutron/tests/unit/bigswitch/test_servermanager.py index e09858cdc2..18e63f3df7 100644 --- a/neutron/tests/unit/bigswitch/test_servermanager.py +++ b/neutron/tests/unit/bigswitch/test_servermanager.py @@ -54,7 +54,7 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase): pl.servers.capabilities = [] self.watch_p.stop() with nested( - mock.patch('time.sleep'), + mock.patch('eventlet.sleep'), mock.patch( SERVERMANAGER + '.ServerPool.rest_call', side_effect=servermanager.RemoteRestError(