From 37b77b18ab0f35a17a6c58dc99163b59ffc27b41 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 1 Oct 2008 09:27:27 +0000
Subject: [PATCH] Fix the watcher with down nodes
The watcher didn't handle the down nodes, fix this by ignoring (in
secondary node reboot checks) any node that doesn't return a boot id.
Reviewed-by: imsnah
---
daemons/ganeti-watcher | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 438cf00ad..fc7fd1be5 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -306,6 +306,11 @@ class Watcher(object):
check_nodes = []
for name, new_id in self.bootids.iteritems():
old = notepad.GetNodeBootID(name)
+ if new_id is None:
+ # Bad node, not returning a boot id
+ logging.debug("Node %s missing boot id, skipping secondary checks",
+ name)
+ continue
if old != new_id:
# Node's boot ID has changed, proably through a reboot.
check_nodes.append(name)
--
GitLab