On Mon, Aug 03, 2015 at 01:31:09PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
With the extended retry-logic connecting to luxid, an absence
of luxid can also be perceived as a TimeoutError. Therefore,
also for this error, make the watcher try to restart the luxi
daemon.
Signed-off-by: Klaus Aehlig <[email protected]>
---
lib/watcher/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 0d51e7d..9142f0e 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -607,7 +607,7 @@ def GetLuxiClient(try_restart):
# this is, from cli.GetClient, a not-master case
raise NotMasterError("Not on master node (%s)" % err)
- except rpcerr.NoMasterError, err:
+ except (rpcerr.NoMasterError, rpcerr.TimeoutError), err:
if not try_restart:
raise
--
2.5.0.rc2.392.g76e840b
LGTM, thanks
