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: include by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 21 Nov 2005 19:44: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:
fsa.c lrm.c
Log Message:
Make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- lrm.c 2 Nov 2005 13:26:19 -0000 1.154
+++ lrm.c 22 Nov 2005 02:44:41 -0000 1.155
@@ -811,6 +811,7 @@
const char *op_key = crm_element_value(
xml_rsc, "operation_key");
+ CRM_ASSERT(op != NULL);
if(op_key == NULL) {
crm_err("No operation to cancel");
crm_log_message(LOG_ERR, input->msg);
@@ -818,7 +819,7 @@
} else if(rsc != NULL) {
cancel_monitor(rsc, op_key);
}
-
+
op->op_status = LRM_OP_DONE;
op->rc = EXECRA_OK;
send_direct_ack(op, rsc->id);
@@ -829,6 +830,7 @@
lrm_op_t* op = NULL;
op = construct_op(input->xml, id_from_cib, operation);
+ CRM_ASSERT(op != NULL);
op->op_status = LRM_OP_DONE;
op->rc = EXECRA_OK;
------------------------------
Message: 2
Date: Mon, 21 Nov 2005 19:44: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:
incarnation.c native.c
Log Message:
Make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- incarnation.c 2 Nov 2005 13:19:30 -0000 1.64
+++ incarnation.c 22 Nov 2005 02:44:41 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.64 2005/11/02 13:19:30 andrew Exp $ */
+/* $Id: incarnation.c,v 1.65 2005/11/22 02:44:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1049,9 +1049,10 @@
goto clone_expand_reallocate;
}
sprintf(rsc_list_s, "%s ", rsc_id);
- rsc_list_s += 1 + strlen(rsc_id);
- rsc_len += 1 + strlen(rsc_id);
-
+ rsc_list_s += strlen(rsc_id);
+ rsc_len += strlen(rsc_id);
+ rsc_list_s++;
+ rsc_len++;
if(node_len + 1 + strlen(uname) >= list_len) {
crm_free(*rsc_list);
@@ -1061,9 +1062,10 @@
goto clone_expand_reallocate;
}
sprintf(node_list_s, "%s ", uname);
- node_list_s += 1 + strlen(uname);
- node_len += 1 + strlen(uname);
-
+ node_list_s += strlen(uname);
+ node_len += strlen(uname);
+ node_list_s++;
+ node_len++;
if(uuid_len + 1 + strlen(uuid) >= list_len) {
crm_free(*rsc_list);
@@ -1073,8 +1075,10 @@
goto clone_expand_reallocate;
}
sprintf(uuid_list_s, "%s ", uuid);
- uuid_list_s += 1 + strlen(uuid);
- uuid_len += 1 + strlen(uuid);
+ uuid_list_s += strlen(uuid);
+ uuid_len += strlen(uuid);
+ uuid_list_s++;
+ uuid_len++;
);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- native.c 2 Nov 2005 13:19:30 -0000 1.101
+++ native.c 22 Nov 2005 02:44:41 -0000 1.102
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.101 2005/11/02 13:19:30 andrew Exp $ */
+/* $Id: native.c,v 1.102 2005/11/22 02:44:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1009,7 +1009,6 @@
" Update LHS: %s, Update RHS: %s",
rsc_lh->id, rsc_rh->id,
update_lh?"true":"false", update_rh?"true":"false");
-
if(rsc_lh->color && rsc_rh->color) {
do_merge = TRUE;
@@ -1790,9 +1789,11 @@
rsc->name, node->details->uname);
return FALSE;
- } else if(node == NULL
- || node->details->unclean
- || node->details->online == FALSE) {
+ } else if(node == NULL) {
+ crm_debug_2("Resource %s not deleted: NULL node", rsc->name);
+ return FALSE;
+
+ } else if(node->details->unclean || node->details->online == FALSE) {
crm_debug_2("Resource %s not deleted from %s: unrunnable",
rsc->name, node->details->uname);
return FALSE;
------------------------------
Message: 3
Date: Mon, 21 Nov 2005 19:44:41 -0700 (MST)
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/common
Modified Files:
xml.h
Log Message:
Make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/xml.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- xml.h 8 Nov 2005 06:27:38 -0000 1.35
+++ xml.h 22 Nov 2005 02:44:41 -0000 1.36
@@ -1,4 +1,4 @@
-/* $Id: xml.h,v 1.35 2005/11/08 06:27:38 gshi Exp $ */
+/* $Id: xml.h,v 1.36 2005/11/22 02:44:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -252,9 +252,9 @@
if(child == NULL) { \
crm_debug_4("Skipping %s == NULL", \
parent->names[__counter]); \
- } else if(filter == NULL \
+ } else if(filter == NULL/*constant condition*/ \
|| safe_str_eq(filter,
parent->names[__counter])) { \
- loop_code;
\
+ loop_code; \
} else { \
crm_debug_4("Skipping <%s../>", \
parent->names[__counter]); \
------------------------------
Message: 4
Date: Mon, 21 Nov 2005 19:45:47 -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/tengine
Modified Files:
match.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/match.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- match.c 31 Oct 2005 09:37:17 -0000 1.1
+++ match.c 22 Nov 2005 02:45:47 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: match.c,v 1.1 2005/10/31 09:37:17 andrew Exp $ */
+/* $Id: match.c,v 1.2 2005/11/22 02:45:47 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -191,7 +191,8 @@
return -2;
}
- te_log_action(LOG_INFO, "Action %d confirmed", match->id);
+ te_log_action(LOG_INFO, "Action %s (%d) confirmed",
+ this_event, match->id);
process_trigger(match->id);
if(te_fsa_state != s_in_transition) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 63
********************************************
