Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Jun 2006 09:11:57 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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_client.c
Log Message:
When the CIB is misconfigured, instead of shutting down (and the CRM respawning
over and over), stay up and let clients know why the CIB is not processing
requests.
This allows the crmd to tell heartbeat not to keep respawning it (because it
will never successfully start)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- cib_client.c 16 May 2006 12:41:28 -0000 1.58
+++ cib_client.c 22 Jun 2006 15:11:56 -0000 1.59
@@ -662,6 +662,15 @@
{
const char *error_msg = NULL;
switch(return_code) {
+ case cib_bad_permissions:
+ error_msg = "bad permissions for the on-disk
configuration. shutdown heartbeat and repair.";
+ break;
+ case cib_bad_digest:
+ error_msg = "the on-disk configuration was manually
altered. shutdown heartbeat and repair.";
+ break;
+ case cib_bad_config:
+ error_msg = "the on-disk configuration is not valid";
+ break;
case cib_msg_field_add:
error_msg = "failed adding field to cib message";
break;
------------------------------
Message: 2
Date: Thu, 22 Jun 2006 10:20:27 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
graph.c
Log Message:
When reconstructing the action key, we need to take into account if its a
notify op, which has a slightly different format
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- graph.c 22 Jun 2006 13:32:15 -0000 1.101
+++ graph.c 22 Jun 2006 16:20:27 -0000 1.102
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.101 2006/06/22 13:32:15 andrew Exp $ */
+/* $Id: graph.c,v 1.102 2006/06/22 16:20:27 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -357,8 +357,20 @@
char *clone_key = NULL;
const char *interval_s = g_hash_table_lookup(action->meta,
"interval");
int interval = crm_parse_int(interval_s, "0");
+
+ if(safe_str_eq(action->task, CRMD_ACTION_NOTIFY)) {
+ const char *n_type = g_hash_table_lookup(
+ action->extra, crm_meta_name("notify_type"));
+ const char *n_task = g_hash_table_lookup(
+ action->extra,
crm_meta_name("notify_operation"));
+ CRM_CHECK(n_type != NULL, ;);
+ CRM_CHECK(n_task != NULL, ;);
+ clone_key =
generate_notify_key(action->rsc->clone_name, n_type, n_task);
+
+ } else {
+ clone_key = generate_op_key(action->rsc->clone_name,
action->task, interval);
+ }
- clone_key = generate_op_key(action->rsc->clone_name,
action->task, interval);
crm_xml_add(action_xml, XML_LRM_ATTR_TASK_KEY, clone_key);
crm_xml_add(action_xml, "internal_"XML_LRM_ATTR_TASK_KEY,
action->uuid);
crm_free(clone_key);
------------------------------
Message: 3
Date: Thu, 22 Jun 2006 10:21:51 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
utils.c
Log Message:
*All* actions should get the default timeout, not just the ones that have
an entry in the operations section of the resource
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/utils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- utils.c 22 Jun 2006 13:34:10 -0000 1.7
+++ utils.c 22 Jun 2006 16:21:51 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.7 2006/06/22 13:34:10 andrew Exp $ */
+/* $Id: utils.c,v 1.8 2006/06/22 16:21:51 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -688,23 +688,21 @@
crm_debug_3("\t%s failure results in: %s",
action->task, role2text(action->fail_role));
- if(xml_obj == NULL) {
- return;
- }
-
- xml_prop_iter(xml_obj, p_name, p_value,
- if(p_value != NULL) {
- g_hash_table_insert(action->meta, crm_strdup(p_name),
- crm_strdup(p_value));
- }
- );
+ if(xml_obj != NULL) {
+ xml_prop_iter(xml_obj, p_name, p_value,
+ if(p_value != NULL) {
+ g_hash_table_insert(action->meta,
crm_strdup(p_name),
+ crm_strdup(p_value));
+ }
+ );
- unpack_instance_attributes(xml_obj, XML_TAG_META_SETS,
- NULL, action->meta, NULL, data_set->now);
+ unpack_instance_attributes(xml_obj, XML_TAG_META_SETS,
+ NULL, action->meta, NULL,
data_set->now);
+
+ unpack_instance_attributes(xml_obj, XML_TAG_ATTR_SETS,
+ NULL, action->meta, NULL,
data_set->now);
+ }
- unpack_instance_attributes(xml_obj, XML_TAG_ATTR_SETS,
- NULL, action->meta, NULL, data_set->now);
-
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));
------------------------------
Message: 4
Date: Thu, 22 Jun 2006 10:25:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Remove unreachable code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_native.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- cib_native.c 29 Mar 2006 06:14:17 -0000 1.57
+++ cib_native.c 22 Jun 2006 16:25:06 -0000 1.58
@@ -242,10 +242,6 @@
crm_err("No reply message - disconnected - %d", rc);
rc = cib_not_connected;
- } else if(rc != IPC_OK) {
- crm_err("No reply message - failed - %d", rc);
- rc = cib_reply_failed;
-
} else if(reg_msg == NULL) {
crm_err("No reply message - empty - %d", rc);
rc = cib_reply_failed;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 85
********************************************
