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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib 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)
----------------------------------------------------------------------
Message: 1
Date: Mon, 8 May 2006 01:42:21 -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/tengine
Modified Files:
callbacks.c
Log Message:
The case used for these strings is not interesting to us, use strcasecmp()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- callbacks.c 26 Apr 2006 15:56:05 -0000 1.79
+++ callbacks.c 8 May 2006 07:42:19 -0000 1.80
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.79 2006/04/26 15:56:05 andrew Exp $ */
+/* $Id: callbacks.c,v 1.80 2006/05/08 07:42:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -169,10 +169,10 @@
if(op == NULL){
/* error */
- } else if(strcmp(op, CRM_OP_HELLO) == 0) {
+ } else if(strcasecmp(op, CRM_OP_HELLO) == 0) {
/* ignore */
- } else if(sys_to == NULL || strcmp(sys_to, CRM_SYSTEM_TENGINE) != 0) {
+ } else if(sys_to == NULL || strcasecmp(sys_to, CRM_SYSTEM_TENGINE) !=
0) {
crm_debug_2("Bad sys-to %s", crm_str(sys_to));
return FALSE;
@@ -209,7 +209,7 @@
crm_err("Message was a response not a request. Discarding");
return TRUE;
- } else if(strcmp(op, CRM_OP_TRANSITION) == 0) {
+ } else if(strcasecmp(op, CRM_OP_TRANSITION) == 0) {
if(transition_graph->complete == FALSE) {
crm_info("Another transition is already active");
abort_transition(
@@ -224,10 +224,10 @@
print_graph(LOG_DEBUG_2, transition_graph);
}
- } else if(strcmp(op, CRM_OP_TE_HALT) == 0) {
+ } else if(strcasecmp(op, CRM_OP_TE_HALT) == 0) {
abort_transition(INFINITY, tg_stop, "Peer Halt", NULL);
- } else if(strcmp(op, CRM_OP_TEABORT) == 0) {
+ } else if(strcasecmp(op, CRM_OP_TEABORT) == 0) {
abort_transition(INFINITY, tg_restart, "Peer Cancelled", NULL);
} else {
------------------------------
Message: 2
Date: Mon, 8 May 2006 01:42:22 -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/common
Modified Files:
msg.c utils.c xml.c
Log Message:
The case used for these strings is not interesting to us, use strcasecmp()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/msg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- msg.c 4 Apr 2006 13:08:52 -0000 1.7
+++ msg.c 8 May 2006 07:42:19 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: msg.c,v 1.7 2006/04/04 13:08:52 andrew Exp $ */
+/* $Id: msg.c,v 1.8 2006/05/08 07:42:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -86,7 +86,7 @@
if (to == NULL) {
crm_info("No sub-system defined.");
action = NULL;
- } else if (true_sys != NULL && strcmp(to, true_sys) != 0) {
+ } else if (true_sys != NULL && strcasecmp(to, true_sys) != 0) {
crm_debug_3("The message is not for this sub-system (%s !=
%s).",
to, true_sys);
action = NULL;
@@ -95,7 +95,7 @@
if (type == NULL) {
crm_info("No message type defined.");
return NULL;
- } else if (msg_type != NULL && strcmp(msg_type, type) != 0) {
+ } else if (msg_type != NULL && strcasecmp(msg_type, type) != 0) {
crm_info("Expecting a (%s) message but received a (%s).",
msg_type, type);
action = NULL;
@@ -276,7 +276,7 @@
CRM_ASSERT(type != NULL);
return NULL;
#if 0
- } else if (strcmp(XML_ATTR_REQUEST, type) != 0) {
+ } else if (strcasecmp(XML_ATTR_REQUEST, type) != 0) {
crm_err("Cannot create new_message,"
" original message was not a request");
return NULL;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- utils.c 5 May 2006 13:16:02 -0000 1.48
+++ utils.c 8 May 2006 07:42:19 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.48 2006/05/05 13:16:02 andrew Exp $ */
+/* $Id: utils.c,v 1.49 2006/05/08 07:42:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -179,7 +179,7 @@
return NULL;
}
- if (strcmp(CRM_SYSTEM_DC, src_subsys) == 0) {
+ if (strcasecmp(CRM_SYSTEM_DC, src_subsys) == 0) {
hash_value = crm_strdup(src_subsys);
if (!hash_value) {
crm_err("memory allocation failed in "
@@ -208,7 +208,7 @@
crm_info("Decoding hash value: (%s:%d)", char_value, value_len);
- if (strcmp(CRM_SYSTEM_DC, (char*)value) == 0) {
+ if (strcasecmp(CRM_SYSTEM_DC, (char*)value) == 0) {
*node = NULL;
*subsys = (char*)crm_strdup(char_value);
CRM_CHECK(*subsys != NULL, return FALSE);
@@ -529,7 +529,7 @@
return TRUE;
} else if(a == NULL || b == NULL) {
return FALSE;
- } else if(strcmp(a, b) == 0) {
+ } else if(strcasecmp(a, b) == 0) {
return TRUE;
}
return FALSE;
@@ -544,7 +544,7 @@
} else if(a==NULL || b==NULL) {
return TRUE;
- } else if(strcmp(a, b) == 0) {
+ } else if(strcasecmp(a, b) == 0) {
return FALSE;
}
return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- xml.c 7 May 2006 08:30:58 -0000 1.77
+++ xml.c 8 May 2006 07:42:19 -0000 1.78
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.77 2006/05/07 08:30:58 andrew Exp $ */
+/* $Id: xml.c,v 1.78 2006/05/08 07:42:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -315,7 +315,7 @@
} else if(node == NULL) {
- } else if(parent_name == NULL && strcmp(name, F_XML_TAGNAME) != 0) {
+ } else if(parent_name == NULL && strcasecmp(name, F_XML_TAGNAME) != 0) {
} else if (value == NULL || strlen(value) <= 0) {
xml_remove_prop(node, name);
@@ -347,7 +347,7 @@
} else if(node == NULL) {
- } else if(parent_name == NULL && strcmp(name, F_XML_TAGNAME) != 0) {
+ } else if(parent_name == NULL && strcasecmp(name, F_XML_TAGNAME) != 0) {
} else {
crm_validate_data(node);
@@ -2365,7 +2365,7 @@
} else if(pair_b->name == NULL) {
return -1;
}
- return strcmp(pair_a->name, pair_b->name);
+ return strcasecmp(pair_a->name, pair_b->name);
}
static void
------------------------------
Message: 3
Date: Mon, 8 May 2006 03:58:58 -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/transition
Modified Files:
graph.c
Log Message:
Incomplete synapses are only a problem if we're not trying to abort.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- graph.c 27 Apr 2006 11:27:48 -0000 1.12
+++ graph.c 8 May 2006 09:58:57 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.12 2006/04/27 11:27:48 andrew Exp $ */
+/* $Id: graph.c,v 1.13 2006/05/08 09:58:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -280,6 +280,8 @@
num_fired++;
} else {
+ crm_debug_2("Synapse %d cannot fire",
+ synapse->id);
num_incomplete++;
}
}
@@ -290,7 +292,7 @@
stat_log_level = LOG_INFO;
pass_result = transition_complete;
- if(num_incomplete != 0) {
+ if(num_incomplete != 0 && graph->abort_priority <= 0) {
stat_log_level = LOG_WARNING;
pass_result = transition_terminated;
------------------------------
_______________________________________________
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 30, Issue 17
********************************************
