Browse Source

dlm: allow dlm do recovery during shutdown

If a node down event happens while dlm shutdown in progress, dlm recovery
should be done before dlm is shutdown.  We can't migrate unrecovered locks,
obviously.  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>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Srinivas Eeda 15 years ago
parent
commit
bc9838c4d4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      fs/ocfs2/dlm/dlmrecovery.c

+ 1 - 1
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);
 	mlog(0, "dlm thread running for %s...\n", dlm->name);
 
 
 	while (!kthread_should_stop()) {
 	while (!kthread_should_stop()) {
-		if (dlm_joined(dlm)) {
+		if (dlm_domain_fully_joined(dlm)) {
 			status = dlm_do_recovery(dlm);
 			status = dlm_do_recovery(dlm);
 			if (status == -EAGAIN) {
 			if (status == -EAGAIN) {
 				/* do not sleep, recheck immediately. */
 				/* do not sleep, recheck immediately. */