proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-27 08:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch from Muni Bajpai to not setup a cleanup handler for a

Browse Source 
checkpoint when a checkpoint open fails.  Patch also fixes up
checkpoint iterators so they do not crash on process exit.

(Logical change 1.164)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@563 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2005-03-29 22:43:15 +00:00
parent 46e2bad993
commit 46c6c4f47c
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
exec/ckpt.c
View File

@ -980,18 +980,10 @@ static int ckpt_exit_fn (struct conn_info *conn_info)
cleanup_list = conn_info->ais_ci.u.libckpt_ci.checkpoint_list.next;
}
#ifdef TODO
/* TODO close section iterators
*/
/*
* TODO what about exit of open checkpoints
*/
if (conn_info->ais_ci.u.libckpt_ci.sectionIterator.sectionIteratorEntries) {
free (conn_info->ais_ci.u.libckpt_ci.sectionIterator.sectionIteratorEntries);
}
list_del (&conn_info->ais_ci.u.libckpt_ci.sectionIterator.list);
#endif
return (0);
}
@ -1125,14 +1117,16 @@ error_exit:
res_lib_ckpt_checkpointopen.header.id = MESSAGE_RES_CKPT_CHECKPOINT_CHECKPOINTOPEN;
res_lib_ckpt_checkpointopen.header.error = error;
checkpoint_cleanup = malloc (sizeof (struct checkpoint_cleanup));
if (checkpoint_cleanup == 0) {
free (ckptCheckpoint);
error = SA_AIS_ERR_NO_MEMORY;
} else {
memcpy(&checkpoint_cleanup->checkpoint,ckptCheckpoint,sizeof(struct saCkptCheckpoint));
list_add (&checkpoint_cleanup->list,
&req_exec_ckpt_checkpointopen->source.conn_info->ais_ci.u.libckpt_ci.checkpoint_list);
if (error == SA_AIS_OK) {
checkpoint_cleanup = malloc (sizeof (struct checkpoint_cleanup));
if (checkpoint_cleanup == 0) {
free (ckptCheckpoint);
error = SA_AIS_ERR_NO_MEMORY;
} else {
memcpy(&checkpoint_cleanup->checkpoint,ckptCheckpoint,sizeof(struct saCkptCheckpoint));
list_add (&checkpoint_cleanup->list,
&req_exec_ckpt_checkpointopen->source.conn_info->ais_ci.u.libckpt_ci.checkpoint_list);
}
}
libais_send_response (req_exec_ckpt_checkpointopen->source.conn_info, &res_lib_ckpt_checkpointopen,