[Ocfs2-devel] [PATCH] dlm: allow dlm do recovery during shutdown

[Ocfs2-devel] [PATCH] dlm: allow dlm do recovery during shutdown

[Srinivas Eeda]

If a node down event happens while dlm shutdown in progress, dlm recovery
should be done before dlm is shutdown. But dlm_reco_thread only does recovery
if the dlm_state is in DLM_CTXT_JOINED.

dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or
DLM_CTXT_IN_SHUTDOWN.

Signed-off-by: Srinivas Eeda <srinivas.eeda@oracle.com>
---
 fs/ocfs2/dlm/dlmrecovery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index d9fa3d2..e347b6a 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -310,7 +310,7 @@ static int dlm_recovery_thread(void *data)
 	mlog(0, "dlm thread running for %s...\n", dlm->name);
 
 	while (!kthread_should_stop()) {
-		if (dlm_joined(dlm)) {
+		if (dlm_domain_fully_joined(dlm)) {
 			status = dlm_do_recovery(dlm);
 			if (status == -EAGAIN) {
 				/* do not sleep, recheck immediately. */
-- 
1.5.6.5

[Ocfs2-devel] [PATCH] dlm: allow dlm do recovery during shutdown

[Sunil Mushran]

sob

Srinivas Eeda wrote:
> If a node down event happens while dlm shutdown in progress, dlm recovery
> should be done before dlm is shutdown. But dlm_reco_thread only does recovery
> if the dlm_state is in DLM_CTXT_JOINED.
>
> dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or
> DLM_CTXT_IN_SHUTDOWN.
>
> Signed-off-by: Srinivas Eeda <srinivas.eeda@oracle.com>
> ---
>  fs/ocfs2/dlm/dlmrecovery.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
> index d9fa3d2..e347b6a 100644
> --- a/fs/ocfs2/dlm/dlmrecovery.c
> +++ b/fs/ocfs2/dlm/dlmrecovery.c
> @@ -310,7 +310,7 @@ static int dlm_recovery_thread(void *data)
>  	mlog(0, "dlm thread running for %s...\n", dlm->name);
>  
>  	while (!kthread_should_stop()) {
> -		if (dlm_joined(dlm)) {
> +		if (dlm_domain_fully_joined(dlm)) {
>  			status = dlm_do_recovery(dlm);
>  			if (status == -EAGAIN) {
>  				/* do not sleep, recheck immediately. */
>   

[Ocfs2-devel] [PATCH] dlm: allow dlm do recovery during shutdown

[Joel Becker]

On Fri, Feb 26, 2010 at 12:53:51PM -0800, Srinivas Eeda wrote:
> If a node down event happens while dlm shutdown in progress, dlm recovery
> should be done before dlm is shutdown. But dlm_reco_thread only does recovery
> if the dlm_state is in DLM_CTXT_JOINED.
> 
> dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or
> DLM_CTXT_IN_SHUTDOWN.
> 
> Signed-off-by: Srinivas Eeda <srinivas.eeda@oracle.com>

This patch is now in the 'merge-window' branch of ocfs2.git.

Joel

-- 

"Nobody loves me,
 Nobody seems to care.
 Troubles and worries, people,
 You know I've had my share."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127