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: lrm by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 25 Dec 2005 05:38:58 -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
Log Message:
Stupidity caught by BEAM
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- incarnation.c 22 Dec 2005 21:04:22 -0000 1.68
+++ incarnation.c 25 Dec 2005 12:38:57 -0000 1.69
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.68 2005/12/22 21:04:22 andrew Exp $ */
+/* $Id: incarnation.c,v 1.69 2005/12/25 12:38:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -993,10 +993,10 @@
clone_expand_reallocate:
if(rsc_list != NULL) {
crm_free(*rsc_list);
- crm_malloc0(*uuid_list, sizeof(char)*list_len);
- CRM_ASSERT(*uuid_list != NULL);
- uuid_list_s = *uuid_list;
- uuid_len = 0;
+ crm_malloc0(*rsc_list, sizeof(char)*list_len);
+ CRM_ASSERT(*rsc_list != NULL);
+ rsc_list_s = *rsc_list;
+ rsc_len = 0;
}
if(node_list != NULL) {
crm_free(*node_list);
@@ -1007,10 +1007,10 @@
}
if(uuid_list != NULL) {
crm_free(*uuid_list);
- crm_malloc0(*rsc_list, sizeof(char)*list_len);
- CRM_ASSERT(*rsc_list != NULL);
- rsc_list_s = *rsc_list;
- rsc_len = 0;
+ crm_malloc0(*uuid_list, sizeof(char)*list_len);
+ CRM_ASSERT(*uuid_list != NULL);
+ uuid_list_s = *uuid_list;
+ uuid_len = 0;
}
/* keep BEAM extra happy */
------------------------------
Message: 2
Date: Sun, 25 Dec 2005 07:40:36 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
More debugging output.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- lrmd.c 25 Dec 2005 04:33:51 -0000 1.190
+++ lrmd.c 25 Dec 2005 14:40:35 -0000 1.191
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.190 2005/12/25 04:33:51 alan Exp $ */
+/* $Id: lrmd.c,v 1.191 2005/12/25 14:40:35 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -928,9 +928,6 @@
inherit_debuglevel = getenv(HADEBUGVAL);
if (inherit_debuglevel != NULL) {
debug_level = atoi(inherit_debuglevel);
- if (debug_level > 2) {
- debug_level = 2;
- }
}
cl_log_set_entity(lrm_system_name);
@@ -3114,10 +3111,12 @@
op_type = ha_msg_value(op->msg, F_LRM_OP);
rc = RAExec->map_ra_retvalue(exitcode, op_type,
op->first_line_ra_stdout);
if (rc != EXECRA_OK || debug_level > 1) {
- lrmd_debug(LOG_DEBUG, "A RA execution: process [%d], "
- "exitcode %d, rc %d, with signo %d, %s, the RA output:
%s"
- , p->pid, exitcode, rc, signo, op_info(op)
- , op->first_line_ra_stdout);
+ lrmd_debug(rc == EXECRA_OK ? LOG_DEBUG : LOG_ERR
+ , "Resource Agent (%s): process [%d], "
+ "exitcode %d, rc %d, with signo %d, the RA output: %s"
+ , op_info(op)
+ , p->pid, exitcode, rc, signo
+ , op->first_line_ra_stdout);
}
if (EXECRA_EXEC_UNKNOWN_ERROR == rc || EXECRA_NO_RA == rc) {
if (HA_OK != ha_msg_mod_int(op->msg, F_LRM_OPSTATUS,
@@ -3361,9 +3360,6 @@
switch (nsig) {
case SIGUSR1:
debug_level++;
- if (debug_level > 2) {
- debug_level = 2;
- }
dump_data_for_debug();
break;
@@ -3448,6 +3444,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.191 2005/12/25 14:40:35 alan
+ * More debugging output.
+ *
* Revision 1.190 2005/12/25 04:33:51 alan
* Made some error-only output come out when debug level is high enough
*
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 67
********************************************
