Accept timeout errors are luxi down

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 <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 0d51e7d..9142f0e 100644 (file)
--- 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