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: crm by andrew from
([email protected])
4. Linux-HA CVS: resources by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 1 Jun 2006 09:40:47 -0600 (MDT)
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
Modified Files:
unpack.c utils.c
Log Message:
use transition_idle_timeout to populate a default action timeout when none
is specified.
rename transition_idle_timeout to default_action_timeout to better reflect
what it does (fall back to the old name if no value is present)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- unpack.c 30 May 2006 09:24:03 -0000 1.199
+++ unpack.c 1 Jun 2006 15:40:46 -0000 1.200
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.199 2006/05/30 09:24:03 andrew Exp $ */
+/* $Id: unpack.c,v 1.200 2006/06/01 15:40:46 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -119,20 +119,22 @@
);
#endif
- get_cluster_pref("transition_idle_timeout");
+ get_cluster_pref("default_action_timeout");
+ if(value == NULL) {
+ get_cluster_pref("transition_idle_timeout");
+ }
if(value != NULL) {
long tmp = crm_get_msec(value);
if(tmp > 0) {
crm_free(data_set->transition_idle_timeout);
data_set->transition_idle_timeout = crm_strdup(value);
} else {
- crm_err("Invalid value for transition_idle_timeout: %s",
+ crm_err("Invalid value for default_action_timeout: %s",
value);
}
}
- crm_debug("%s set to: %s",
- "transition_idle_timeout", data_set->transition_idle_timeout);
+ crm_debug("default_action_timeout set to: %s",
data_set->transition_idle_timeout);
get_cluster_pref("default_"XML_RSC_ATTR_STICKINESS);
data_set->default_resource_stickiness = char2score(value);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- utils.c 1 Jun 2006 08:54:42 -0000 1.141
+++ utils.c 1 Jun 2006 15:40:46 -0000 1.142
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.141 2006/06/01 08:54:42 andrew Exp $ */
+/* $Id: utils.c,v 1.142 2006/06/01 15:40:46 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1014,6 +1014,11 @@
unpack_instance_attributes(xml_obj, XML_TAG_ATTR_SETS,
NULL, action->meta, NULL,0, data_set);
+ if(g_hash_table_lookup(action->meta, "timeout") == NULL) {
+ g_hash_table_insert(action->meta, crm_strdup("timeout"),
+
crm_strdup(data_set->transition_idle_timeout));
+ }
+
for(;lpc < DIMOF(fields); lpc++) {
value = g_hash_table_lookup(action->meta, fields[lpc]);
if(value != NULL) {
------------------------------
Message: 2
Date: Thu, 1 Jun 2006 09:56:40 -0600 (MDT)
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:
If we're deleting a failcount, then we need to poke the TE into a recalculation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- crm_attribute.c 17 May 2006 08:53:17 -0000 1.16
+++ crm_attribute.c 1 Jun 2006 15:56:39 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.16 2006/05/17 08:53:17 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.17 2006/06/01 15:56:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -327,6 +327,11 @@
} else if(DO_DELETE) {
rc = delete_attr(the_cib, cib_sync_call, type, dest_node,
set_name,
attr_id, attr_name, attr_value);
+
+ if(safe_str_eq(crm_system_name, "crm_failcount")) {
+ update_attr(the_cib, cib_sync_call,
+ NULL, NULL, NULL, NULL, "last-lrm-refresh",
now_s);
+ }
} else if(DO_WRITE) {
int cib_opts = cib_sync_call;
------------------------------
Message: 3
Date: Thu, 1 Jun 2006 10:05:59 -0600 (MDT)
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:
Uh, and the rest
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- crm_attribute.c 1 Jun 2006 15:56:39 -0000 1.17
+++ crm_attribute.c 1 Jun 2006 16:05:59 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.17 2006/06/01 15:56:39 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.18 2006/06/01 16:05:59 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -329,8 +329,12 @@
attr_id, attr_name, attr_value);
if(safe_str_eq(crm_system_name, "crm_failcount")) {
+ char *now_s = NULL;
+ time_t now = time(NULL);
+ now_s = crm_itoa(now);
update_attr(the_cib, cib_sync_call,
NULL, NULL, NULL, NULL, "last-lrm-refresh",
now_s);
+ crm_free(now_s);
}
} else if(DO_WRITE) {
------------------------------
Message: 4
Date: Thu, 1 Jun 2006 10:25:02 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Makefile.am
Log Message:
Missing RA
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Makefile.am 1 Jun 2006 08:44:40 -0000 1.15
+++ Makefile.am 1 Jun 2006 16:25:02 -0000 1.16
@@ -55,10 +55,11 @@
LinuxSCSI \
LVM \
MailTo \
+ pingd \
portblock \
Raid1 \
ServeRAID \
- SysInfo \
+ SysInfo \
VIPArip \
WAS \
WinPopup \
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 6
*******************************************
