From 8522ceeb9e08d8dd701c9771c7b42814b7f952fa Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 27 Nov 2007 14:15:17 +0000
Subject: [PATCH] Fix logging of some checks in LUClusterVerify
Currently, the results of ConfigWriter.VerifyConfig() are lost. Make
sure we log them too in cluster verify.
Reviewed-by: ultrotter
---
lib/cmdlib.py | 3 ++-
lib/config.py | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 88ef489d4..a8135fd1c 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -796,7 +796,8 @@ class LUVerifyCluster(NoHooksLU):
"""
bad = False
feedback_fn("* Verifying global settings")
- self.cfg.VerifyConfig()
+ for msg in self.cfg.VerifyConfig():
+ feedback_fn(" - ERROR: %s" % msg)
vg_name = self.cfg.GetVGName()
nodelist = utils.NiceSort(self.cfg.GetNodeList())
diff --git a/lib/config.py b/lib/config.py
index 50fc784dc..fcf8b9fa0 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -168,15 +168,15 @@ class ConfigWriter:
for instance_name in data.instances:
instance = data.instances[instance_name]
if instance.primary_node not in data.nodes:
- result.append("Instance '%s' has invalid primary node '%s'" %
+ result.append("instance '%s' has invalid primary node '%s'" %
(instance_name, instance.primary_node))
for snode in instance.secondary_nodes:
if snode not in data.nodes:
- result.append("Instance '%s' has invalid secondary node '%s'" %
+ result.append("instance '%s' has invalid secondary node '%s'" %
(instance_name, snode))
for idx, nic in enumerate(instance.nics):
if nic.mac in seen_macs:
- result.append("Instance '%s' has NIC %d mac %s duplicate" %
+ result.append("instance '%s' has NIC %d mac %s duplicate" %
(instance_name, idx, nic.mac))
else:
seen_macs.append(nic.mac)
--
GitLab