From: Kevin Benton <blak111@gmail.com>
Date: Mon, 17 Mar 2014 20:39:50 +0000 (-0700)
Subject: BigSwitch: Watchdog thread start after servers
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dafe6598c70e74781053acf68a8d5a7cea064a0e;p=openstack-build%2Fneutron-build.git

BigSwitch: Watchdog thread start after servers

Start the watchdog thread after the servers have
been initialized.

Closes-Bug: #1293799
Change-Id: Ic7ae1f55bd7faed6edde84d9d0b52fc8fe7a1fc1
---

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index 5efafed7e..1afa0eb9d 100644
--- a/neutron/plugins/bigswitch/servermanager.py
+++ b/neutron/plugins/bigswitch/servermanager.py
@@ -245,8 +245,6 @@ class ServerPool(object):
         # Hash to send to backend with request as expected previous
         # state to verify consistency.
         self.consistency_hash = cdb.get_consistency_hash()
-        eventlet.spawn(self._consistency_watchdog,
-                       cfg.CONF.RESTPROXY.consistency_interval)
 
         if not servers:
             raise cfg.Error(_('Servers not defined. Aborting server manager.'))
@@ -262,6 +260,8 @@ class ServerPool(object):
             self.server_proxy_for(server, int(port))
             for server, port in (s.rsplit(':', 1) for s in servers)
         ]
+        eventlet.spawn(self._consistency_watchdog,
+                       cfg.CONF.RESTPROXY.consistency_interval)
         LOG.debug(_("ServerPool: initialization done"))
 
     def get_capabilities(self):