* [Ocfs2-devel] [PATCH 3/4] ocfs2/dlm: clear DROPPING_REF flag when the master goes down
@ 2016-01-26 9:43 xuejiufei
2016-01-27 1:38 ` Joseph Qi
0 siblings, 1 reply; 2+ messages in thread
From: xuejiufei @ 2016-01-26 9:43 UTC (permalink / raw)
To: ocfs2-devel
If the master goes down after return in-progress for deref message. The
lock resource on non-master node can not be purged. Clear the
DROPPING_REF flag and recovery it.
Signed-off-by: xuejiufei <xuejiufei@huawei.com>
---
fs/ocfs2/dlm/dlmrecovery.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index c5bdf02..c19059a 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -2375,14 +2375,16 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)
dlm_revalidate_lvb(dlm, res, dead_node);
if (res->owner == dead_node) {
if (res->state & DLM_LOCK_RES_DROPPING_REF) {
- mlog(ML_NOTICE, "%s: res %.*s, Skip "
- "recovery as it is being freed\n",
- dlm->name, res->lockname.len,
- res->lockname.name);
- } else
- dlm_move_lockres_to_recovery_list(dlm,
- res);
-
+ mlog(0, "%s:%.*s: owned by "
+ "dead node %u, this node was "
+ "dropping its ref when it died. "
+ "continue, dropping the flag.\n",
+ dlm->name, res->lockname.len,
+ res->lockname.name, dead_node);
+ }
+ res->state &= ~DLM_LOCK_RES_DROPPING_REF;
+ dlm_move_lockres_to_recovery_list(dlm,
+ res);
} else if (res->owner == dlm->node_num) {
dlm_free_dead_locks(dlm, res, dead_node);
__dlm_lockres_calc_usage(dlm, res);
--
1.8.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Ocfs2-devel] [PATCH 3/4] ocfs2/dlm: clear DROPPING_REF flag when the master goes down
2016-01-26 9:43 [Ocfs2-devel] [PATCH 3/4] ocfs2/dlm: clear DROPPING_REF flag when the master goes down xuejiufei
@ 2016-01-27 1:38 ` Joseph Qi
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2016-01-27 1:38 UTC (permalink / raw)
To: ocfs2-devel
On 2016/1/26 17:43, xuejiufei wrote:
> If the master goes down after return in-progress for deref message. The
> lock resource on non-master node can not be purged. Clear the
> DROPPING_REF flag and recovery it.
>
> Signed-off-by: xuejiufei <xuejiufei@huawei.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
> ---
> fs/ocfs2/dlm/dlmrecovery.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
> index c5bdf02..c19059a 100644
> --- a/fs/ocfs2/dlm/dlmrecovery.c
> +++ b/fs/ocfs2/dlm/dlmrecovery.c
> @@ -2375,14 +2375,16 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)
> dlm_revalidate_lvb(dlm, res, dead_node);
> if (res->owner == dead_node) {
> if (res->state & DLM_LOCK_RES_DROPPING_REF) {
> - mlog(ML_NOTICE, "%s: res %.*s, Skip "
> - "recovery as it is being freed\n",
> - dlm->name, res->lockname.len,
> - res->lockname.name);
> - } else
> - dlm_move_lockres_to_recovery_list(dlm,
> - res);
> -
> + mlog(0, "%s:%.*s: owned by "
> + "dead node %u, this node was "
> + "dropping its ref when it died. "
> + "continue, dropping the flag.\n",
> + dlm->name, res->lockname.len,
> + res->lockname.name, dead_node);
> + }
> + res->state &= ~DLM_LOCK_RES_DROPPING_REF;
> + dlm_move_lockres_to_recovery_list(dlm,
> + res);
> } else if (res->owner == dlm->node_num) {
> dlm_free_dead_locks(dlm, res, dead_node);
> __dlm_lockres_calc_usage(dlm, res);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-27 1:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-26 9:43 [Ocfs2-devel] [PATCH 3/4] ocfs2/dlm: clear DROPPING_REF flag when the master goes down xuejiufei
2016-01-27 1:38 ` Joseph Qi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.