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: membership by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 26 Apr 2006 09:59:04 -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:
unpack.c
Log Message:
remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- unpack.c 24 Apr 2006 14:29:20 -0000 1.190
+++ unpack.c 26 Apr 2006 15:59:04 -0000 1.191
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.190 2006/04/24 14:29:20 lars Exp $ */
+/* $Id: unpack.c,v 1.191 2006/04/26 15:59:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1390,17 +1390,10 @@
}
if(task_status_i != LRM_OP_PENDING) {
-
task_id_i = crm_parse_int(task_id, "-1");
CRM_CHECK(task_id != NULL, return FALSE);
CRM_CHECK(task_id_i >= 0, return FALSE);
-
- if(task_id_i == *max_call_id) {
- crm_debug_2("Already processed this call");
- return TRUE;
- }
-
CRM_CHECK(task_id_i > *max_call_id, return FALSE);
}
@@ -1472,21 +1465,6 @@
switch(task_status_i) {
case LRM_OP_PENDING:
- /*
- * TODO: this may need some more thought
- * Some cases:
- * - PE reinvoked with pending action that will succeed
- * - PE reinvoked with pending action that will fail
- * - After DC election
- * - After startup
- *
- * pending start - required start
- * pending stop - required stop
- * pending <any> on unavailable node - stonith
- *
- * For now this should do
- */
-
if(safe_str_eq(task, CRMD_ACTION_START)) {
rsc->start_pending = TRUE;
rsc->role = RSC_ROLE_STARTED;
------------------------------
Message: 2
Date: Wed, 26 Apr 2006 11:07:11 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccm.c
Log Message:
prevent a null-pointer coredump
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccm.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- ccm.c 17 Feb 2006 05:48:24 -0000 1.112
+++ ccm.c 26 Apr 2006 17:07:11 -0000 1.113
@@ -131,7 +131,7 @@
status = ha_msg_value(msg, F_STATUS);
ccm_debug(LOG_DEBUG, "recv msg %s from %s, status:%s"
- , type, orig, status);
+ , type, orig, (status ? status : "[null ptr]"));
ccm_message_debug2(LOG_DEBUG, msg);
if(strcmp(type, T_APICLISTAT) == 0){
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 138
*********************************************
