[pve-devel] [RFC pve-ha-manager 5/5] Adapt log message and regression tests

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Nov 11 12:39:05 CET 2015


This adapts the log message when successfully fenced a node, so that
it has the correct meaning. As a result the log.expect files from
the regression tests needs to be updated accordingly.

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 src/PVE/HA/NodeStatus.pm        | 2 +-
 src/test/test-basic1/log.expect | 2 +-
 src/test/test-basic2/log.expect | 2 +-
 src/test/test-basic5/log.expect | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PVE/HA/NodeStatus.pm b/src/PVE/HA/NodeStatus.pm
index 9a045de..db044d8 100644
--- a/src/PVE/HA/NodeStatus.pm
+++ b/src/PVE/HA/NodeStatus.pm
@@ -188,7 +188,7 @@ sub fence_node {
     }
 
     if ($success) {
-	$haenv->log("info", "fencing: acknowleged - got agent lock for node '$node'");
+	$haenv->log("info", "fencing: acknowleged for node '$node'");
 	&$set_node_state($self, $node, 'unknown');
 	PVE::HA::Fence::reset($node);
     }
diff --git a/src/test/test-basic1/log.expect b/src/test/test-basic1/log.expect
index 77599b3..566b4c3 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: acknowleged for node 'node3'
 info    240    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 info    240    node1/crm: service 'vm:103': state changed from 'fence' to 'stopped' 
 info    260    node1/crm: service 'vm:103': state changed from 'stopped' to 'started'  (node = node2)
diff --git a/src/test/test-basic2/log.expect b/src/test/test-basic2/log.expect
index 95346f2..df715f9 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: acknowleged for node 'node1'
 info     22    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
 info     22    node3/crm: service 'vm:101': state changed from 'fence' to 'stopped' 
 info     40    node1/crm: status change wait_for_quorum => slave
diff --git a/src/test/test-basic5/log.expect b/src/test/test-basic5/log.expect
index ca25f00..1d6af9a 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: acknowleged for node 'node1'
 info    282    node3/crm: node 'node1': state changed from 'fence' => 'unknown'
 info    282    node3/crm: service 'vm:101': state changed from 'fence' to 'stopped' 
 info    282    node3/crm: service 'vm:101': state changed from 'stopped' to 'started'  (node = node2)
-- 
2.1.4




More information about the pve-devel mailing list