From 861a296ebbd853115d59a3327f4085c4e6769294 Mon Sep 17 00:00:00 2001
From: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
Date: Tue, 14 Dec 2010 11:18:29 -0200
Subject: [PATCH] Fix N+1 error message
The error contained a typo and is slightly cumbersome. It changes from:
- ERROR: node a: not enough memory on to accommodate failovers should peer node
b fail
to:
- ERROR: node a: not enough memory to accomodate instance failovers should node
b fail
Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
doc/walkthrough.rst | 2 +-
lib/cmdlib.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/walkthrough.rst b/doc/walkthrough.rst
index ce0edc3a4..06bdf6dec 100644
--- a/doc/walkthrough.rst
+++ b/doc/walkthrough.rst
@@ -903,7 +903,7 @@ cluster looks like::
Mon Oct 26 18:59:37 2009 * Verifying orphan volumes
Mon Oct 26 18:59:37 2009 * Verifying remaining instances
Mon Oct 26 18:59:37 2009 * Verifying N+1 Memory redundancy
- Mon Oct 26 18:59:37 2009 - ERROR: node node2: not enough memory on to accommodate failovers should peer node node1 fail
+ Mon Oct 26 18:59:37 2009 - ERROR: node node2: not enough memory to accommodate instance failovers should node node1 fail
Mon Oct 26 18:59:37 2009 * Other Notes
Mon Oct 26 18:59:37 2009 * Hooks Results
node1#
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d8a6dc1e2..850979570 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1721,8 +1721,8 @@ class LUVerifyCluster(LogicalUnit):
needed_mem += bep[constants.BE_MEMORY]
test = n_img.mfree < needed_mem
self._ErrorIf(test, self.ENODEN1, node,
- "not enough memory on to accommodate"
- " failovers should peer node %s fail", prinode)
+ "not enough memory to accomodate instance failovers"
+ " should node %s fail", prinode)
def _VerifyNodeFiles(self, ninfo, nresult, file_list, local_cksum,
master_files):
--
GitLab