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: include by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 2 Jun 2006 09:36:22 -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:
native.c
Log Message:
Downgrade logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- native.c 2 Jun 2006 09:58:30 -0000 1.147
+++ native.c 2 Jun 2006 15:36:21 -0000 1.148
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.147 2006/06/02 09:58:30 andrew Exp $ */
+/* $Id: native.c,v 1.148 2006/06/02 15:36:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1760,7 +1760,8 @@
CRM_CHECK(node != NULL, return NULL);
if(node->details->online == FALSE) {
- crm_info("Skipping notification for %s", rsc->id);
+ crm_debug("Skipping notification for %s on %s",
+ rsc->id, node->details->uname);
return NULL;
}
------------------------------
Message: 2
Date: Fri, 2 Jun 2006 09:37: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/crmd
Modified Files:
lrm.c
Log Message:
Unpack parameters for new resources correctly
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- lrm.c 24 May 2006 19:14:59 -0000 1.194
+++ lrm.c 2 Jun 2006 15:37:47 -0000 1.195
@@ -738,7 +738,7 @@
}
static lrm_rsc_t *
-get_lrm_resource(crm_data_t *resource, crm_data_t *param_list, gboolean
do_create)
+get_lrm_resource(crm_data_t *resource, crm_data_t *op_msg, gboolean do_create)
{
char rid[64];
lrm_rsc_t *rsc = NULL;
@@ -766,7 +766,7 @@
const char *type = crm_element_value(resource, XML_ATTR_TYPE);
const char *class = crm_element_value(resource,
XML_AGENT_ATTR_CLASS);
const char *provider = crm_element_value(resource,
XML_AGENT_ATTR_PROVIDER);
- GHashTable *params = xml2list(param_list);
+ GHashTable *params = xml2list(op_msg);
CRM_CHECK(class != NULL, return NULL);
CRM_CHECK(type != NULL, return NULL);
@@ -776,14 +776,18 @@
rid[63] = 0;
#if CRM_DEPRECATED_SINCE_2_0_3
- if(param_list != NULL) {
+ if(op_msg != NULL) {
if(g_hash_table_lookup(
params, XML_ATTR_CRM_VERSION) == NULL) {
g_hash_table_destroy(params);
- params = xml2list_202(param_list);
+ params = xml2list_202(op_msg);
}
}
#endif
+ if(g_hash_table_size(params) == 0) {
+ crm_log_xml_warn(op_msg, "EmptyParams");
+ }
+
fsa_lrm_conn->lrm_ops->add_rsc(
fsa_lrm_conn, rid, class, type, provider, params);
@@ -873,7 +877,7 @@
/* only the first 16 chars are used by the LRM */
params = find_xml_node(input->xml, XML_TAG_ATTRS,TRUE);
- rsc = get_lrm_resource(xml_rsc, params, TRUE);
+ rsc = get_lrm_resource(xml_rsc, input->xml, TRUE);
if(rsc == NULL) {
crm_err("Invalid resource definition");
------------------------------
Message: 3
Date: Fri, 2 Jun 2006 09:39:14 -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:
pengine.c
Log Message:
Preparation to send the graph via the filesystem
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- pengine.c 8 May 2006 07:42:18 -0000 1.112
+++ pengine.c 2 Jun 2006 15:39:14 -0000 1.113
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.112 2006/05/08 07:42:18 andrew Exp $ */
+/* $Id: pengine.c,v 1.113 2006/06/02 15:39:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -114,10 +114,24 @@
do_calculations(&data_set, xml_data, NULL);
crm_log_xml_debug_3(data_set.graph, "[out]");
+#if 1
if(send_ipc_reply(sender, msg, data_set.graph) == FALSE) {
crm_err("Answer could not be sent");
}
+#else
+ HA_Message *reply = NULL;
+ reply = create_reply(msg, NULL);
+ if (reply != NULL) {
+ char *tmp_file = mktemp(HA_VARRUNHBDIR"/tgraph-XXXXXX");
+ write_xml_file(data_set.graph, tmp_file, FALSE);
+ ha_msg_add(reply, "on-disk-graph", tmp_file);
+ crm_free(tmp_file);
+ if(send_ipc_message(sender, reply) == FALSE) {
+ crm_err("Answer could not be sent");
+ }
+ }
+#endif
series_id = get_series();
series_wrap = series[series_id].wrap;
value = g_hash_table_lookup(
------------------------------
Message: 4
Date: Fri, 2 Jun 2006 09:52:14 -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:
New defines
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/msg_xml.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- msg_xml.h 22 May 2006 08:33:25 -0000 1.54
+++ msg_xml.h 2 Jun 2006 15:52:13 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: msg_xml.h,v 1.54 2006/05/22 08:33:25 andrew Exp $ */
+/* $Id: msg_xml.h,v 1.55 2006/06/02 15:52:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -231,8 +231,8 @@
#define XML_NODE_ATTR_STATE "state"
-#define XML_CONFIG_ATTR_DC_BEAT "dc_heartbeat"
#define XML_CONFIG_ATTR_DC_DEADTIME "dc_deadtime"
+#define XML_CONFIG_ATTR_ELECTION_FAIL "election_timeout"
#define XML_CONFIG_ATTR_FORCE_QUIT "shutdown_escalation"
#define XML_CONFIG_ATTR_REANNOUNCE "join_reannouce"
#define XML_CONFIG_ATTR_RECHECK "cluster_recheck_interval"
------------------------------
_______________________________________________
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 10
********************************************
