Skip to contentSkip to conversation

dlm: allow dlm do recovery during shutdown

PATCH New Srinivas Eeda 3 participants 3 messages Feb 26, 2010 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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. 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.

---
 fs/ocfs2/dlm/dlmrecovery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ocfs2/dlm/dlmrecovery.c +1 -1
index d9fa3d2..e347b6a 100644
@@ -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. */
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 dlm: allow dlm do recovery during shutdown

sob

Quoted 26 lines · 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.

---
 fs/ocfs2/dlm/dlmrecovery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ocfs2/dlm/dlmrecovery.c +1 -1
index d9fa3d2..e347b6a 100644
@@ -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. */
#2 lore raw

PATCH 1/1 dlm: allow dlm do recovery during shutdown

In reply to Srinivas Eeda
Quoted 8 lines · 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.

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

Joel

Signature · 10 lines
"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