mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
Make sure clvmd-corosync releases the lockspace when it exits.
patch from Xinwei Hu
This commit is contained in:
parent
8f85721f00
commit
3330038ebc
@ -1,5 +1,6 @@
|
|||||||
Version 2.02.46 -
|
Version 2.02.46 -
|
||||||
================================
|
================================
|
||||||
|
Make sure clvmd-corosync releases the lockspace when it exits.
|
||||||
Fix segfault for vgcfgrestore on VG with missing PVs.
|
Fix segfault for vgcfgrestore on VG with missing PVs.
|
||||||
Block SIGTERM & SIGINT in clvmd subthreads.
|
Block SIGTERM & SIGINT in clvmd subthreads.
|
||||||
Detect and conditionally wipe swapspace signatures in pvcreate.
|
Detect and conditionally wipe swapspace signatures in pvcreate.
|
||||||
|
@ -334,7 +334,7 @@ static int _init_cluster(void)
|
|||||||
if (err != CS_OK) {
|
if (err != CS_OK) {
|
||||||
cpg_finalize(cpg_handle);
|
cpg_finalize(cpg_handle);
|
||||||
quorum_finalize(quorum_handle);
|
quorum_finalize(quorum_handle);
|
||||||
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
|
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
|
||||||
syslog(LOG_ERR, "Cannot join clvmd process group");
|
syslog(LOG_ERR, "Cannot join clvmd process group");
|
||||||
DEBUGLOG("Cannot join clvmd process group: %d\n", err);
|
DEBUGLOG("Cannot join clvmd process group: %d\n", err);
|
||||||
return cs_to_errno(err);
|
return cs_to_errno(err);
|
||||||
@ -345,7 +345,7 @@ static int _init_cluster(void)
|
|||||||
if (err != CS_OK) {
|
if (err != CS_OK) {
|
||||||
cpg_finalize(cpg_handle);
|
cpg_finalize(cpg_handle);
|
||||||
quorum_finalize(quorum_handle);
|
quorum_finalize(quorum_handle);
|
||||||
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
|
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
|
||||||
syslog(LOG_ERR, "Cannot get local node id\n");
|
syslog(LOG_ERR, "Cannot get local node id\n");
|
||||||
return cs_to_errno(err);
|
return cs_to_errno(err);
|
||||||
}
|
}
|
||||||
@ -361,7 +361,7 @@ static void _cluster_closedown(void)
|
|||||||
DEBUGLOG("cluster_closedown\n");
|
DEBUGLOG("cluster_closedown\n");
|
||||||
unlock_all();
|
unlock_all();
|
||||||
|
|
||||||
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 0);
|
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
|
||||||
cpg_finalize(cpg_handle);
|
cpg_finalize(cpg_handle);
|
||||||
quorum_finalize(quorum_handle);
|
quorum_finalize(quorum_handle);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user