errors: Document arguments to QueryFilterParseError

[ganeti-local] / lib / watcher / nodemaint.py

diff --git a/lib/watcher/nodemaint.py b/lib/watcher/nodemaint.py
index 2cf5a4b..6cb2a48 100644 (file)
--- a/lib/watcher/nodemaint.py
+++ b/lib/watcher/nodemaint.py
@@ -34,7 +34,7 @@ from ganeti import ssconf
 from ganeti import utils
 from ganeti import confd
 
-import ganeti.confd.client # pylint: disable-msg=W0611
+import ganeti.confd.client # pylint: disable=W0611
 
 
 class NodeMaintenance(object):
@@ -70,7 +70,7 @@ class NodeMaintenance(object):
         hv = hypervisor.GetHypervisor(hv_name)
         ilist = hv.ListInstances()
         results.extend([(iname, hv_name) for iname in ilist])
-      except: # pylint: disable-msg=W0702
+      except: # pylint: disable=W0702
         logging.error("Error while listing instances for hypervisor %s",
                       hv_name, exc_info=True)
     return results
@@ -121,7 +121,7 @@ class NodeMaintenance(object):
       logging.info("Following DRBD minors should not be active,"
                    " shutting them down: %s", utils.CommaJoin(drbd_running))
       for minor in drbd_running:
-        # pylint: disable-msg=W0212
+        # pylint: disable=W0212
         # using the private method as is, pending enhancements to the DRBD
         # interface
         bdev.DRBD8._ShutdownAll(minor)
@@ -130,10 +130,14 @@ class NodeMaintenance(object):
     """Check node status versus cluster desired state.
 
     """
+    if not constants.ENABLE_CONFD:
+      logging.warning("Confd use not enabled, cannot do maintenance")
+      return
+
     my_name = netutils.Hostname.GetSysName()
-    req = confd.client.ConfdClientRequest(type=
-                                          constants.CONFD_REQ_NODE_ROLE_BYNAME,
-                                          query=my_name)
+    req = \
+      confd.client.ConfdClientRequest(type=constants.CONFD_REQ_NODE_ROLE_BYNAME,
+                                      query=my_name)
     self.confd_client.SendRequest(req, async=False, coverage=-1)
     timed_out, _, _ = self.confd_client.WaitForReply(req.rsalt)
     if not timed_out: