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: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: fencing by sunjd from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Tue, 20 Jun 2006 02:49:43 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : sunjd Host : Project : linux-ha Module : lrm Dir : linux-ha/lrm/lrmd Modified Files: lrmd.c Log Message: fix the 'MEMORY NOT PRISTINE' issue; fix a memory leak =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v retrieving revision 1.225 retrieving revision 1.226 diff -u -3 -r1.225 -r1.226 --- lrmd.c 19 Jun 2006 05:49:42 -0000 1.225 +++ lrmd.c 20 Jun 2006 08:49:42 -0000 1.226 @@ -1,4 +1,4 @@ -/* $Id: lrmd.c,v 1.225 2006/06/19 05:49:42 sunjd Exp $ */ +/* $Id: lrmd.c,v 1.226 2006/06/20 08:49:42 sunjd Exp $ */ /* * Local Resource Manager Daemon * @@ -3140,8 +3140,11 @@ op_params = ha_msg_value_str_table(op->msg, F_LRM_PARAM); params = merge_str_tables(rsc->params,op_params); - free_str_table(op_params); ha_msg_mod_str_table(op->msg, F_LRM_PARAM, params); + free_str_table(op_params); + op_params = NULL; + free_str_table(params); + params = NULL; check_queue_duration(op); if(HA_OK != ha_msg_value_int(op->msg, F_LRM_TIMEOUT, &timeout)){ @@ -3216,6 +3219,7 @@ lrmd_debug2(LOG_DEBUG , "perform_ra_op:calling RA plugin to perform %s, pid: [%d]" , op_info(op), getpid()); + params = ha_msg_value_str_table(op->msg, F_LRM_PARAM); RAExec->execra (rsc->id, rsc->type, rsc->provider, @@ -3509,11 +3513,11 @@ } } if ( NULL != rapop->ra_stdout_gsource) { - /* Don't try to optimize it */ - GFDSource * tmp; - tmp = rapop->ra_stdout_gsource; + /* + * Returning FALSE will trigger ipc code to release + * the GFDSource, so donn't release it here. + */ rapop->ra_stdout_gsource = NULL; - G_main_del_fd(tmp); } rc = FALSE; } @@ -3589,15 +3593,14 @@ } if ( NULL != rapop->ra_stderr_gsource) { /* - * Don't try to optimize it. * G_main_del_fd will trigger * destroy_pipe_ra_stderr * ra_pipe_op_destroy + * + * Returning FALSE will trigger ipc code to release + * the GFDSource, so donn't release it here. */ - GFDSource * tmp; - tmp = rapop->ra_stderr_gsource; rapop->ra_stderr_gsource = NULL; - G_main_del_fd(tmp); } rc = FALSE; } @@ -3831,6 +3834,9 @@ } /* * $Log: lrmd.c,v $ + * Revision 1.226 2006/06/20 08:49:42 sunjd + * fix the 'MEMORY NOT PRISTINE' issue; fix a memory leak + * * Revision 1.225 2006/06/19 05:49:42 sunjd * (bug1204)set child number limit as 16; degrade some related logs * ------------------------------ Message: 2 Date: Tue, 20 Jun 2006 03:11:34 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : sunjd Host : Project : linux-ha Module : lrm Dir : linux-ha/lrm/lrmd Modified Files: lrmd.c Log Message: BEAM: add a check for memory allocation =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v retrieving revision 1.226 retrieving revision 1.227 diff -u -3 -r1.226 -r1.227 --- lrmd.c 20 Jun 2006 08:49:42 -0000 1.226 +++ lrmd.c 20 Jun 2006 09:11:34 -0000 1.227 @@ -1,4 +1,4 @@ -/* $Id: lrmd.c,v 1.226 2006/06/20 08:49:42 sunjd Exp $ */ +/* $Id: lrmd.c,v 1.227 2006/06/20 09:11:34 sunjd Exp $ */ /* * Local Resource Manager Daemon * @@ -2715,6 +2715,12 @@ } new_str = cl_malloc(sizeof(char)*len); + if (NULL == new_str) { + lrmd_log(LOG_ERR,"%s:%d: cl_malloc failed" + , __FUNCTION__, __LINE__); + return NULL; + } + memset(new_str, 0, len); sprintf(new_str, "%s%c%s", prefix?prefix:"", join, suffix?suffix:""); new_str[len-1] = 0; @@ -3834,6 +3840,9 @@ } /* * $Log: lrmd.c,v $ + * Revision 1.227 2006/06/20 09:11:34 sunjd + * BEAM: add a check for memory allocation + * * Revision 1.226 2006/06/20 08:49:42 sunjd * fix the 'MEMORY NOT PRISTINE' issue; fix a memory leak * ------------------------------ Message: 3 Date: Tue, 20 Jun 2006 03:17:30 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : sunjd Host : Project : linux-ha Module : fencing Dir : linux-ha/fencing/stonithd Modified Files: stonithd.c Log Message: remove the redundant code =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- stonithd.c 19 Jun 2006 05:03:15 -0000 1.95 +++ stonithd.c 20 Jun 2006 09:17:30 -0000 1.96 @@ -1,4 +1,4 @@ -/* $Id: stonithd.c,v 1.95 2006/06/19 05:03:15 sunjd Exp $ */ +/* $Id: stonithd.c,v 1.96 2006/06/20 09:17:30 sunjd Exp $ */ /* File: stonithd.c * Description: STONITH daemon for node fencing @@ -1240,11 +1240,10 @@ static gboolean reboot_block_timeout(gpointer data) { - int * timer_id; gchar * target = (gchar *)data; if (NULL != - (timer_id=g_hash_table_lookup(reboot_blocked_table, target))) { + g_hash_table_lookup(reboot_blocked_table, target) ) { g_hash_table_remove(reboot_blocked_table, target); stonithd_log(LOG_INFO, "Unblock the reboot to node %s", target); } else { @@ -3584,6 +3583,9 @@ /* * $Log: stonithd.c,v $ + * Revision 1.96 2006/06/20 09:17:30 sunjd + * remove the redundant code + * * Revision 1.95 2006/06/19 05:03:15 sunjd * (bug1318)Add to send back a confirmation of setting up the callback channel * ------------------------------ Message: 4 Date: Tue, 20 Jun 2006 03:47:55 -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/cib Modified Files: messages.c Log Message: OSDL #1329: Fix for memory leak in CIB_OP_MODIFY =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- messages.c 29 May 2006 11:53:53 -0000 1.79 +++ messages.c 20 Jun 2006 09:47:55 -0000 1.80 @@ -1,4 +1,4 @@ -/* $Id: messages.c,v 1.79 2006/05/29 11:53:53 andrew Exp $ */ +/* $Id: messages.c,v 1.80 2006/06/20 09:47:55 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -633,7 +633,6 @@ crm_debug_2("Processing \"%s\" event for section=%s", op, crm_str(section)); - failed = create_xml_node(NULL, XML_TAG_FAILED); if (strcasecmp(CIB_OP_CREATE, op) == 0) { cib_update_op = CIB_UPDATE_OP_ADD; @@ -668,6 +667,7 @@ crm_validate_data(input); crm_validate_data(*result_cib); + failed = create_xml_node(NULL, XML_TAG_FAILED); /* make changes to a temp copy then activate */ if(section == NULL) { @@ -712,6 +712,8 @@ } crm_log_xml_err(failed, "CIB Update failures"); *answer = failed; + } else { + free_xml(failed); } return result; ------------------------------ _______________________________________________ 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 64 ********************************************