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: include by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 18 Apr 2006 05:15:37 -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
Modified Files:
crm-1.0.dtd
Log Message:
Fix detection and handling of resource definition changes and orphan
actions.
Added "disabled" to an operation which makes it behave as if it was an orphan
Update the DTD
Some new #define's
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- crm-1.0.dtd 9 Apr 2006 15:13:23 -0000 1.56
+++ crm-1.0.dtd 18 Apr 2006 11:15:37 -0000 1.57
@@ -80,6 +80,7 @@
description CDATA #IMPLIED
interval CDATA #IMPLIED
timeout CDATA #IMPLIED
+ disabled (true|1|false|0) 'false'
role (Master|Slave|Started|Stopped) 'Started'
prereq (nothing|quorum|fencing) #IMPLIED
on_fail (nothing|block|stop|fence) #IMPLIED>
------------------------------
Message: 2
Date: Tue, 18 Apr 2006 05:15:38 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
msg_xml.h
Log Message:
Fix detection and handling of resource definition changes and orphan
actions.
Added "disabled" to an operation which makes it behave as if it was an orphan
Update the DTD
Some new #define's
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/msg_xml.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- msg_xml.h 5 Apr 2006 07:37:37 -0000 1.51
+++ msg_xml.h 18 Apr 2006 11:15:37 -0000 1.52
@@ -1,4 +1,4 @@
-/* $Id: msg_xml.h,v 1.51 2006/04/05 07:37:37 andrew Exp $ */
+/* $Id: msg_xml.h,v 1.52 2006/04/18 11:15:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -177,6 +177,7 @@
#define XML_CIB_ATTR_SHUTDOWN "shutdown"
#define XML_CIB_ATTR_STONITH "stonith"
+#define XML_LRM_ATTR_INTERVAL "interval"
#define XML_LRM_ATTR_TASK "operation"
#define XML_LRM_ATTR_TASK_KEY "operation_key"
#define XML_LRM_ATTR_TARGET "on_node"
------------------------------
Message: 3
Date: Tue, 18 Apr 2006 05:19:42 -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:
master.c
Log Message:
Look for both forms of the resource name
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- master.c 12 Apr 2006 08:40:17 -0000 1.13
+++ master.c 18 Apr 2006 11:19:42 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.13 2006/04/12 08:40:17 andrew Exp $ */
+/* $Id: master.c,v 1.14 2006/04/18 11:19:42 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -287,13 +287,21 @@
len = 8 + strlen(child_rsc->graph_name);
crm_malloc0(attr_name, len);
- sprintf(attr_name, "master-%s",
child_rsc->graph_name);
+ sprintf(attr_name, "master-%s", child_rsc->id);
crm_debug_2("looking for %s on %s", attr_name,
chosen->details->uname);
attr_value = g_hash_table_lookup(
chosen->details->attrs, attr_name);
+ if(attr_value == NULL) {
+ sprintf(attr_name, "master-%s",
child_rsc->graph_name);
+ crm_debug_2("looking for %s on %s",
attr_name,
+ chosen->details->uname);
+ attr_value = g_hash_table_lookup(
+ chosen->details->attrs,
attr_name);
+ }
+
if(attr_value != NULL) {
crm_debug("%s=%s for %s", attr_name,
crm_str(attr_value),
------------------------------
Message: 4
Date: Tue, 18 Apr 2006 05:20:29 -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/crmd
Modified Files:
messages.c
Log Message:
Only send updates if we're connected to the CIB
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- messages.c 9 Apr 2006 12:47:35 -0000 1.147
+++ messages.c 18 Apr 2006 11:20:29 -0000 1.148
@@ -1061,11 +1061,8 @@
CRMD_STATE_INACTIVE, FALSE, __FUNCTION__);
crm_xml_add_int(node_state, XML_CIB_ATTR_SHUTDOWN, (int)now);
- fsa_cib_conn->cmds->update(
- fsa_cib_conn, XML_CIB_TAG_STATUS, node_state, NULL,
- cib_quorum_override);
-
- crm_log_xml_debug(node_state, "Shutdown update");
+ fsa_cib_anon_update(XML_CIB_TAG_STATUS,node_state, cib_quorum_override);
+ crm_log_xml_debug_2(node_state, "Shutdown update");
free_xml(node_state);
/* will be picked up by the TE as long as its running */
------------------------------
Message: 5
Date: Tue, 18 Apr 2006 05:23:45 -0600 (MDT)
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:
Might come in handy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- utils.c 10 Apr 2006 16:18:08 -0000 1.46
+++ utils.c 18 Apr 2006 11:23:45 -0000 1.47
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.46 2006/04/10 16:18:08 andrew Exp $ */
+/* $Id: utils.c,v 1.47 2006/04/18 11:23:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -925,6 +925,26 @@
return op_id;
}
+gboolean
+parse_op_key(const char *key, char **rsc_id, char **op_type, int *interval)
+{
+ char *interval_s = NULL;
+ char *key2 = NULL;
+
+ if(decodeNVpair(key, '_', rsc_id, &key2) == FALSE) {
+ crm_err("Couldn't find '_' in: %s", key);
+ return FALSE;
+ }
+
+ if(decodeNVpair(key2, '_', op_type, &interval_s) == FALSE) {
+ crm_err("Couldn't find '_' in: %s", key2);
+ return FALSE;
+ }
+
+ *interval = crm_parse_int(interval_s, NULL);
+ return TRUE;
+}
+
char *
generate_notify_key(const char *rsc_id, const char *notify_type, const char
*op_type)
{
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 92
********************************************
