[pve-devel] [PATCH ha-manager v2] Fix #1189: correct spelling in fence mail

Thomas Lamprecht t.lamprecht at proxmox.com
Mon Oct 31 14:04:35 CET 2016


Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---

Changes since v1:
* adapt regression tests which included the typo

 src/PVE/HA/NodeStatus.pm                 | 4 ++--
 src/test/test-basic1/log.expect          | 2 +-
 src/test/test-basic2/log.expect          | 2 +-
 src/test/test-basic5/log.expect          | 2 +-
 src/test/test-locked-service1/log.expect | 2 +-
 src/test/test-recovery1/log.expect       | 2 +-
 src/test/test-shutdown1/log.expect       | 2 +-
 src/test/test-shutdown2/log.expect       | 2 +-
 src/test/test-shutdown3/log.expect       | 2 +-
 src/test/test-shutdown4/log.expect       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/PVE/HA/NodeStatus.pm b/src/PVE/HA/NodeStatus.pm
index 4574709..b99689c 100644
--- a/src/PVE/HA/NodeStatus.pm
+++ b/src/PVE/HA/NodeStatus.pm
@@ -219,10 +219,10 @@ sub fence_node {
     my $success = $haenv->get_ha_agent_lock($node);
 
     if ($success) {
-	my $msg = "fencing: acknowleged - got agent lock for node '$node'";
+	my $msg = "fencing: acknowledged - got agent lock for node '$node'";
 	$haenv->log("info", $msg);
 	&$set_node_state($self, $node, 'unknown');
-	&$send_fence_state_email($self, 'SUCEED', $msg, $node);
+	&$send_fence_state_email($self, 'SUCCEED', $msg, $node);
     }
 
     return $success;
diff --git a/src/test/test-basic1/log.expect b/src/test/test-basic1/log.expect
index 68df71b..c24b41e 100644
--- a/src/test/test-basic1/log.expect
+++ b/src/test/test-basic1/log.expect
@@ -41,7 +41,7 @@ info    165    node3/crm: killed by poweroff
 info    166    node3/lrm: killed by poweroff
 info    166     hardware: server 'node3' stopped by poweroff (watchdog)
 info    240    node1/crm: got lock 'ha_agent_node3_lock'
-info    240    node1/crm: fencing: acknowleged - got agent lock for node 'node3'
+info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    240    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    240    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node2'
 info    240    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node2)
diff --git a/src/test/test-basic2/log.expect b/src/test/test-basic2/log.expect
index 72822ce..6b112df 100644
--- a/src/test/test-basic2/log.expect
+++ b/src/test/test-basic2/log.expect
@@ -9,7 +9,7 @@ info     22    node3/crm: got lock 'ha_manager_lock'
 info     22    node3/crm: status change wait_for_quorum => master
 info     22    node3/crm: node 'node2': state changed from 'online' => 'unknown'
 info     22    node3/crm: got lock 'ha_agent_node1_lock'
-info     22    node3/crm: fencing: acknowleged - got agent lock for node 'node1'
+info     22    node3/crm: fencing: acknowledged - got agent lock for node 'node1'
 info     22    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
 info     22    node3/crm: recover service 'vm:101' from fenced node 'node1' to node 'node3'
 info     22    node3/crm: service 'vm:101': state changed from 'fence' to 'started'  (node = node3)
diff --git a/src/test/test-basic5/log.expect b/src/test/test-basic5/log.expect
index 54b579c..a0db483 100644
--- a/src/test/test-basic5/log.expect
+++ b/src/test/test-basic5/log.expect
@@ -44,7 +44,7 @@ info    222    node3/crm: node 'node1': state changed from 'online' => 'unknown'
 info    282    node3/crm: service 'vm:101': state changed from 'started' to 'fence'
 info    282    node3/crm: node 'node1': state changed from 'unknown' => 'fence'
 info    282    node3/crm: got lock 'ha_agent_node1_lock'
-info    282    node3/crm: fencing: acknowleged - got agent lock for node 'node1'
+info    282    node3/crm: fencing: acknowledged - got agent lock for node 'node1'
 info    282    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
 info    282    node3/crm: recover service 'vm:101' from fenced node 'node1' to node 'node2'
 info    282    node3/crm: service 'vm:101': state changed from 'fence' to 'started'  (node = node2)
diff --git a/src/test/test-locked-service1/log.expect b/src/test/test-locked-service1/log.expect
index 6bc04a1..f3f84f3 100644
--- a/src/test/test-locked-service1/log.expect
+++ b/src/test/test-locked-service1/log.expect
@@ -32,7 +32,7 @@ info    265    node3/crm: killed by poweroff
 info    266    node3/lrm: killed by poweroff
 info    266     hardware: server 'node3' stopped by poweroff (watchdog)
 info    340    node1/crm: got lock 'ha_agent_node3_lock'
-info    340    node1/crm: fencing: acknowleged - got agent lock for node 'node3'
+info    340    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    340    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    340    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 warn    340    node1/crm: removed leftover lock 'backup' from recovered service 'vm:103' to allow its start.
diff --git a/src/test/test-recovery1/log.expect b/src/test/test-recovery1/log.expect
index ffd732a..7a9232a 100644
--- a/src/test/test-recovery1/log.expect
+++ b/src/test/test-recovery1/log.expect
@@ -31,7 +31,7 @@ info    163    node2/crm: killed by poweroff
 info    164    node2/lrm: killed by poweroff
 info    164     hardware: server 'node2' stopped by poweroff (watchdog)
 info    240    node1/crm: got lock 'ha_agent_node2_lock'
-info    240    node1/crm: fencing: acknowleged - got agent lock for node 'node2'
+info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node2'
 info    240    node1/crm: node 'node2': state changed from 'fence' => 'unknown'
 err     240    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 info    240    node1/crm: service 'vm:102': state changed from 'fence' to 'error'
diff --git a/src/test/test-shutdown1/log.expect b/src/test/test-shutdown1/log.expect
index 9dbdb84..11a64d9 100644
--- a/src/test/test-shutdown1/log.expect
+++ b/src/test/test-shutdown1/log.expect
@@ -32,7 +32,7 @@ info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
-info    200    node1/crm: fencing: acknowleged - got agent lock for node 'node3'
+info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    200    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)
diff --git a/src/test/test-shutdown2/log.expect b/src/test/test-shutdown2/log.expect
index c3fbb07..104e40e 100644
--- a/src/test/test-shutdown2/log.expect
+++ b/src/test/test-shutdown2/log.expect
@@ -32,7 +32,7 @@ info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
-info    200    node1/crm: fencing: acknowleged - got agent lock for node 'node3'
+info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    200    node1/crm: recover service 'vm:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'vm:103': state changed from 'fence' to 'started'  (node = node1)
diff --git a/src/test/test-shutdown3/log.expect b/src/test/test-shutdown3/log.expect
index 16d8c4e..5cc2eb6 100644
--- a/src/test/test-shutdown3/log.expect
+++ b/src/test/test-shutdown3/log.expect
@@ -32,7 +32,7 @@ info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'
 info    200    node1/crm: service 'ct:103': state changed from 'started' to 'fence'
 info    200    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
 info    200    node1/crm: got lock 'ha_agent_node3_lock'
-info    200    node1/crm: fencing: acknowleged - got agent lock for node 'node3'
+info    200    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    200    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    200    node1/crm: recover service 'ct:103' from fenced node 'node3' to node 'node1'
 info    200    node1/crm: service 'ct:103': state changed from 'fence' to 'started'  (node = node1)
diff --git a/src/test/test-shutdown4/log.expect b/src/test/test-shutdown4/log.expect
index 843104b..352dd1b 100644
--- a/src/test/test-shutdown4/log.expect
+++ b/src/test/test-shutdown4/log.expect
@@ -35,7 +35,7 @@ info    141    node2/crm: node 'node1': state changed from 'online' => 'unknown'
 info    220    node2/crm: service 'vm:100': state changed from 'started' to 'fence'
 info    220    node2/crm: node 'node1': state changed from 'unknown' => 'fence'
 info    220    node2/crm: got lock 'ha_agent_node1_lock'
-info    220    node2/crm: fencing: acknowleged - got agent lock for node 'node1'
+info    220    node2/crm: fencing: acknowledged - got agent lock for node 'node1'
 info    220    node2/crm: node 'node1': state changed from 'fence' => 'unknown'
 info    220    node2/crm: recover service 'vm:100' from fenced node 'node1' to node 'node2'
 info    220    node2/crm: service 'vm:100': state changed from 'fence' to 'started'  (node = node2)
-- 
2.1.4





More information about the pve-devel mailing list