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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 27 Mar 2006 07:53:17 -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/admin
Modified Files:
crm_attribute.c
Log Message:
Always use the calculated uname
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- crm_attribute.c 14 Mar 2006 16:18:03 -0000 1.9
+++ crm_attribute.c 27 Mar 2006 14:53:16 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.9 2006/03/14 16:18:03 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.10 2006/03/27 14:53:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -213,19 +213,13 @@
}
if(safe_str_eq(crm_system_name, "crm_master")) {
- dest_node = getenv("OCF_RESKEY_on_node_uuid");
- if(dest_node == NULL) {
- struct utsname name;
- crm_err("Could not determin node UUID."
- " Using local uname.");
-
- if(uname(&name) != 0) {
- cl_perror("uname(3) call failed");
- return 1;
- }
- dest_uname = name.nodename;
- crm_info("Detected: %s", dest_uname);
+ struct utsname name;
+ if(uname(&name) != 0) {
+ cl_perror("uname(3) call failed");
+ return 1;
}
+ dest_uname = name.nodename;
+ crm_info("Detected: %s", dest_uname);
}
if(dest_node == NULL && dest_uname != NULL) {
------------------------------
Message: 2
Date: Mon, 27 Mar 2006 07:53:41 -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/admin
Modified Files:
crm_mon.c
Log Message:
Correct interpretation of -n and -r
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- crm_mon.c 18 Mar 2006 17:17:19 -0000 1.19
+++ crm_mon.c 27 Mar 2006 14:53:40 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.19 2006/03/18 17:17:19 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.20 2006/03/27 14:53:40 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -421,16 +421,29 @@
}
);
- if(group_by_node && inactive_resources) {
+ if(group_by_node == FALSE && inactive_resources) {
print_as("\nFull list of resources:\n");
+
+ } else if(inactive_resources) {
+ print_as("\nInactive resources:\n");
}
+
if(group_by_node == FALSE || inactive_resources) {
print_as("\n");
slist_iter(rsc, resource_t, data_set.resources, lpc2,
+ gboolean is_active = rsc->fns->active(rsc, TRUE);
+ gboolean partially_active = rsc->fns->active(rsc,
FALSE);
if(rsc->orphan) {
continue;
+
+ } else if(group_by_node == FALSE) {
+ if(partially_active || inactive_resources) {
+ rsc->fns->print(rsc, NULL,
print_opts, stdout);
+ }
+
+ } else if(is_active == FALSE && inactive_resources) {
+ rsc->fns->print(rsc, NULL, print_opts,
stdout);
}
- rsc->fns->print(rsc, NULL, print_opts, stdout);
);
}
------------------------------
Message: 3
Date: Mon, 27 Mar 2006 07:54:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
utils.c
Log Message:
Simplify
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- utils.c 18 Mar 2006 17:23:48 -0000 1.36
+++ utils.c 27 Mar 2006 14:54:59 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.36 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: utils.c,v 1.37 2006/03/27 14:54:59 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1003,9 +1003,8 @@
len += strlen(op_type);
len += strlen(rsc_id);
crm_malloc0(op_id, sizeof(char)*len);
- if(op_id != NULL) {
- sprintf(op_id, "%s_%s_%d", rsc_id, op_type, interval);
- }
+ CRM_CHECK(op_id != NULL, return NULL);
+ sprintf(op_id, "%s_%s_%d", rsc_id, op_type, interval);
return op_id;
}
------------------------------
Message: 4
Date: Mon, 27 Mar 2006 07:56:20 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CIB.py.in
Log Message:
Default stop_orphan_resources and actions to true.
Add the 3rd resource back to the group
Give the group resources half sensible names
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- CIB.py.in 25 Mar 2006 16:55:17 -0000 1.5
+++ CIB.py.in 27 Mar 2006 14:56:19 -0000 1.6
@@ -17,8 +17,8 @@
<nvpair id="c-pref-1" name="transition_idle_timeout" value="3m"/>
<nvpair id="c-pref-2" name="symmetric_cluster" value="true"/>
<nvpair id="c-pref-3" name="short_resource_names" value="%d"/>
- <nvpair id="c-pref-4" name="stop_orphan_resources" value="false"/>
- <nvpair id="c-pref-5" name="stop_orphan_actions" value="false"/>
+ <nvpair id="c-pref-4" name="stop_orphan_resources" value="true"/>
+ <nvpair id="c-pref-5" name="stop_orphan_actions" value="true"/>
<nvpair id="c-pref-6" name="remove_after_stop" value="false"/>
<nvpair id="c-pref-7" name="is_managed_default" value="true"/>
<nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>
@@ -88,6 +88,7 @@
<primitive id="ocf_msdummy" class="ocf"
type="@libdir@/heartbeat/cts/OCFMSDummy" provider="heartbeat">
<operations>
<op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="10s"/>
+ <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
timeout="10s" role="Master"/>
</operations>
<instance_attributes>
<attributes>
@@ -99,23 +100,33 @@
resource_group_template = '''
<group id="group-1">
- <primitive id="ocf_child" class="ocf" type="IPaddr"
provider="heartbeat">
+ <primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="ocf_child_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="ocf_chil%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
</operations>
<instance_attributes>
<attributes>
- <nvpair id="ocf_child_ip_1" name="ip" value="%s"/>
+ <nvpair id="ocf_%s_ip_1" name="ip" value="%s"/>
</attributes>
</instance_attributes>
</primitive>
- <primitive id="heartbeat_child" class="heartbeat" type="IPaddr"
provider="heartbeat">
+ <primitive id="heartbeat_%s" class="heartbeat" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="heartbeat_child_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="heartbeat_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
</operations>
<instance_attributes>
<attributes>
- <nvpair id="heartbeat_child_ip_1" name="1" value="%s"/>
+ <nvpair id="heartbeat_%s_ip_1" name="1" value="%s"/>
+ </attributes>
+ </instance_attributes>
+ </primitive>
+ <primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
+ <operations>
+ <op id="ocf_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ </operations>
+ <instance_attributes>
+ <attributes>
+ <nvpair id="ocf_%s_ip_1" name="ip" value="%s"/>
</attributes>
</instance_attributes>
</primitive>
@@ -209,7 +220,8 @@
ip1=self.NextIP()
ip2=self.NextIP()
- resources += self.resource_group_template % (ip1, ip2)
+ ip3=self.NextIP()
+ resources += self.resource_group_template % (ip1, ip1, ip1, ip1, ip2,
ip2, ip2, ip2, ip3, ip3, ip3, ip3)
# lsb resource
resources += self.lsb_resource
------------------------------
_______________________________________________
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 70
********************************************
