Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 28 Mar 2006 02:20:37 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
indicate the updating data status in status bar
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- haclient.py.in 17 Mar 2006 09:12:06 -0000 1.12
+++ haclient.py.in 28 Mar 2006 09:20:37 -0000 1.13
@@ -1114,6 +1114,7 @@
cur_name = None
cur_view = None
view_widget = None
+ statusbar = None
tree = None
# utility functions
@@ -1136,8 +1137,9 @@
# functions
def update(self) :
self.tree.update()
+ self.statusbar.pop(1)
return False
-
+
def select_view(self, type, name, status) :
for child in self.view_widget.get_children() :
self.view_widget.remove(child)
@@ -1317,8 +1319,8 @@
main = glade.get_widget("mainwin_main")
vbox.pack_start(main, True)
- statusbar = gtk.Statusbar()
- vbox.pack_end(statusbar, False)
+ self.statusbar = gtk.Statusbar()
+ vbox.pack_end(self.statusbar, False)
# show the window
win_widget.show_all()
@@ -1330,7 +1332,7 @@
self.tree = Tree(glade.get_widget("mainwin_tree"))
self.view_widget = glade.get_widget("mainwin_view")
self.update_ui()
-
+ self.statusbar.push(1,"Done")
class Manager :
'''
@@ -1400,8 +1402,10 @@
self.username = username
self.password = password
self.active_nodes = self.do_cmd("active_nodes")
+
+ window.statusbar.push(1,"Updating data from server...")
+ gobject.timeout_add(100, window.update)
- window.update()
self.do_cmd("regevt\nevt:cib_changed")
self.do_cmd("regevt\nevt:disconnected")
@@ -1441,7 +1445,8 @@
if event == "evt:cib_changed" :
self.dirty = True
self.cache_clear()
- gobject.timeout_add(1000, window.update)
+ window.statusbar.push(1,"Updating data from server...")
+ gobject.timeout_add(100, window.update)
return True
elif event == "evt:disconnected" :
self.logout()
------------------------------
Message: 2
Date: Tue, 28 Mar 2006 05:03:07 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Modified Files:
master-0.exp master-1.exp master-2.exp master-3.exp
master-4.exp
Log Message:
Include role information for master/slave actions.
The value should be correct but more importantly its presence indicates
that the resource is being cloned and should act "statefully".
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-0.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- master-0.exp 8 Mar 2006 15:51:36 -0000 1.3
+++ master-0.exp 28 Mar 2006 12:03:06 -0000 1.4
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -16,7 +16,7 @@
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -29,7 +29,7 @@
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -42,7 +42,7 @@
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-1.exp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- master-1.exp 8 Mar 2006 15:51:36 -0000 1.4
+++ master-1.exp 28 Mar 2006 12:03:06 -0000 1.5
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -16,7 +16,7 @@
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -29,7 +29,7 @@
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -42,7 +42,7 @@
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -55,7 +55,7 @@
<action_set>
<rsc_op id="5" rsc_id="rsc1:child_rsc1:2" operation="promote"
operation_key="rsc1:child_rsc1:2_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -68,7 +68,7 @@
<action_set>
<rsc_op id="6" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.exp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- master-2.exp 27 Mar 2006 05:44:24 -0000 1.6
+++ master-2.exp 28 Mar 2006 12:03:06 -0000 1.7
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -16,7 +16,7 @@
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:2" operation="promote"
operation_key="rsc1:child_rsc1:2_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -29,7 +29,7 @@
<action_set>
<rsc_op id="31" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_post_notify_start_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -42,7 +42,7 @@
<action_set>
<rsc_op id="32" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_pre_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -55,7 +55,7 @@
<action_set>
<rsc_op id="33" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_post_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="2" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -68,7 +68,7 @@
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -81,7 +81,7 @@
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -94,7 +94,7 @@
<action_set>
<rsc_op id="34" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_post_notify_start_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -107,7 +107,7 @@
<action_set>
<rsc_op id="35" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_pre_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -120,7 +120,7 @@
<action_set>
<rsc_op id="36" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_post_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="3" clone_max="5" crm_role="Master" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -133,7 +133,7 @@
<action_set>
<rsc_op id="5" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -146,7 +146,7 @@
<action_set>
<rsc_op id="37" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -159,7 +159,7 @@
<action_set>
<rsc_op id="38" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_pre_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -172,7 +172,7 @@
<action_set>
<rsc_op id="39" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_post_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="0" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -185,7 +185,7 @@
<action_set>
<rsc_op id="6" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 "
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -198,7 +198,7 @@
<action_set>
<rsc_op id="40" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="start" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -211,7 +211,7 @@
<action_set>
<rsc_op id="41" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_pre_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -224,7 +224,7 @@
<action_set>
<rsc_op id="42" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_post_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1"
clone_node_max="2"/>
+ <attributes notify_confirm="yes"
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post"
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4"
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 "
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 "
clone="1" clone_max="5" crm_role="Slave" notify="true" master_max="2"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-3.exp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- master-3.exp 8 Mar 2006 15:51:36 -0000 1.4
+++ master-3.exp 28 Mar 2006 12:03:06 -0000 1.5
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -16,7 +16,7 @@
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="3" clone_max="5"
crm_role="Master" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -29,7 +29,7 @@
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="1" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -42,7 +42,7 @@
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="0" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -55,7 +55,7 @@
<action_set>
<rsc_op id="5" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
master_max="2" master_node_max="1" clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="2" clone_max="5"
crm_role="Slave" master_max="2" master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-4.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-4.exp 27 Mar 2006 15:53:10 -0000 1.2
+++ master-4.exp 28 Mar 2006 12:03:06 -0000 1.3
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="4" rsc_id="ocf_msdummy:0" operation="cancel"
operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
- <attributes timeout="10000" crm_feature_set="1.0.4" interval="5000"
task="monitor" clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log"
master_max="4" master_node_max="1" clone_node_max="2"/>
+ <attributes timeout="10000" crm_feature_set="1.0.4" interval="5000"
task="monitor" clone="0" clone_max="8" crm_role="Master"
logfile="/var/log/cts_ocfdummy.log" master_max="4" master_node_max="1"
clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs/>
@@ -12,7 +12,7 @@
<action_set>
<rsc_op id="56" rsc_id="ocf_msdummy:0" operation="promote"
operation_key="ocf_msdummy:0_promote_0" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
- <attributes crm_feature_set="1.0.4" clone="0" clone_max="8"
logfile="/var/log/cts_ocfdummy.log" master_max="4" master_node_max="1"
clone_node_max="2"/>
+ <attributes crm_feature_set="1.0.4" clone="0" clone_max="8"
crm_role="Master" logfile="/var/log/cts_ocfdummy.log" master_max="4"
master_node_max="1" clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
@@ -28,7 +28,7 @@
<action_set>
<rsc_op id="57" rsc_id="ocf_msdummy:0" operation="monitor"
operation_key="ocf_msdummy:0_monitor_6000" on_node="c001n08"
on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="ocf_msdummy:0" class="ocf"
type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat"/>
- <attributes timeout="10000" te-target-rc="8" crm_feature_set="1.0.4"
interval="6000" clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log"
master_max="4" master_node_max="1" clone_node_max="2"/>
+ <attributes timeout="10000" te-target-rc="8" crm_feature_set="1.0.4"
interval="6000" clone="0" clone_max="8" crm_role="Master"
logfile="/var/log/cts_ocfdummy.log" master_max="4" master_node_max="1"
clone_node_max="2"/>
</rsc_op>
</action_set>
<inputs>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 75
********************************************
