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: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 12 Jan 2006 08:10:43 -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/crmd
Modified Files:
subsystems.c
Log Message:
We are the server - if the client goes away it should be a warning only
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/subsystems.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- subsystems.c 16 Sep 2005 16:45:58 -0000 1.88
+++ subsystems.c 12 Jan 2006 15:10:42 -0000 1.89
@@ -122,7 +122,7 @@
AM_I_DC?CRM_SYSTEM_DC:CRM_SYSTEM_CRMD, NULL);
crm_info("Sending quit message to %s.", the_subsystem->name);
- send_ipc_message(client_channel, quit);
+ crm_send_ipc_message(client_channel, quit, TRUE);
}
return TRUE;
------------------------------
Message: 2
Date: Thu, 12 Jan 2006 08:11:08 -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
Modified Files:
native.c
Log Message:
Tips for new players...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- native.c 7 Jan 2006 20:57:59 -0000 1.106
+++ native.c 12 Jan 2006 15:11:08 -0000 1.107
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.106 2006/01/07 20:57:59 andrew Exp $ */
+/* $Id: native.c,v 1.107 2006/01/12 15:11:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -126,11 +126,20 @@
}
if(rsc->variant == pe_native && g_list_length(rsc->running_on) > 1) {
- pe_warn("Resource %s is (potentially) active on %d nodes."
- " Latest: %s/%s", rsc->id,
- g_list_length(rsc->running_on),
- node->details->uname, node->details->id);
-
+ const char *type = crm_element_value(rsc->xml, XML_ATTR_TYPE);
+ const char *class = crm_element_value(
+ rsc->xml, XML_AGENT_ATTR_CLASS);
+
+ /* these are errors because hardly any gets it right
+ * at the moment and this way the might notice
+ */
+ pe_err("Resource %s is (potentially) active on %d nodes."
+ " Latest: %s/%s", rsc->id,
+ g_list_length(rsc->running_on),
+ node->details->uname, node->details->id);
+ pe_err("Please confirm your %s Resource Agent (on all nodes)"
+ " conforms to the %s spec.", type, class);
+
if(rsc->recovery_type == recovery_stop_only) {
native_assign_color(rsc, data_set->no_color);
------------------------------
Message: 3
Date: Thu, 12 Jan 2006 08:11:42 -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/cib
Modified Files:
cib_native.c
Log Message:
Code formatting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_native.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- cib_native.c 31 Oct 2005 08:49:33 -0000 1.48
+++ cib_native.c 12 Jan 2006 15:11:41 -0000 1.49
@@ -134,7 +134,8 @@
if(rc == cib_ok) {
crm_debug_4("Connecting callback channel");
native->callback_source = init_client_ipc_comms(
- cib_channel_callback, cib_native_dispatch, cib,
&(native->callback_channel));
+ cib_channel_callback, cib_native_dispatch,
+ cib, &(native->callback_channel));
if(native->callback_channel == NULL) {
crm_debug("Connection to callback channel failed");
------------------------------
Message: 4
Date: Thu, 12 Jan 2006 08:11:42 -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
Modified Files:
pengine.c
Log Message:
Code formatting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- pengine.c 7 Jan 2006 21:00:24 -0000 1.100
+++ pengine.c 12 Jan 2006 15:11:42 -0000 1.101
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.100 2006/01/07 21:00:24 andrew Exp $ */
+/* $Id: pengine.c,v 1.101 2006/01/12 15:11:42 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -107,7 +107,7 @@
do_calculations(&data_set, xml_data, NULL);
crm_log_xml_debug_3(data_set.graph, "[out]");
- if (send_ipc_reply(sender, msg, data_set.graph) ==FALSE) {
+ if(send_ipc_reply(sender, msg, data_set.graph) == FALSE) {
crm_err("Answer could not be sent");
}
------------------------------
Message: 5
Date: Thu, 12 Jan 2006 08:15: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/crmd
Modified Files:
lrm.c
Log Message:
Use the utility function for consistency
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- lrm.c 11 Jan 2006 19:53:02 -0000 1.160
+++ lrm.c 12 Jan 2006 15:15:41 -0000 1.161
@@ -814,7 +814,8 @@
/* only the first 16 chars are used by the LRM */
strncpy(rid, id_from_cib, 64);
rid[63] = 0;
-
+
+ crm_debug_2("Retrieving %s from the LRM.", rid);
rsc = fsa_lrm_conn->lrm_ops->get_rsc(fsa_lrm_conn, rid);
if(safe_str_eq(operation, CRMD_ACTION_CANCEL)) {
@@ -990,9 +991,8 @@
crm_info("ACK'ing resource op: %s for %s", op->op_type, op->rsc_id);
- update = create_xml_node(NULL, XML_CIB_TAG_STATE);
- set_uuid(fsa_cluster_conn, update, XML_ATTR_UUID, fsa_our_uname);
- crm_xml_add(update, XML_ATTR_UNAME, fsa_our_uname);
+ update = create_node_state(
+ fsa_our_uname, NULL, NULL, NULL, NULL, NULL, FALSE,
__FUNCTION__);
iter = create_xml_node(update, XML_CIB_TAG_LRM);
iter = create_xml_node(iter, XML_LRM_TAG_RESOURCES);
@@ -1322,9 +1322,8 @@
return;
}
- update = create_xml_node(NULL, XML_CIB_TAG_STATE);
- set_uuid(fsa_cluster_conn, update, XML_ATTR_UUID, fsa_our_uname);
- crm_xml_add(update, XML_ATTR_UNAME, fsa_our_uname);
+ update = create_node_state(
+ fsa_our_uname, NULL, NULL, NULL, NULL, NULL, FALSE,
__FUNCTION__);
iter = create_xml_node(update, XML_CIB_TAG_LRM);
iter = create_xml_node(iter, XML_LRM_TAG_RESOURCES);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 25
********************************************
