Skip to contentSkip to conversation

res_recover_locks_count not reset when recover_locks is aborted [39/70]

DLM Steven Whitehouse 1 participant 1 message Nov 30, 2006 Distributed lock manager (DLM)

lore
Share & tools
lore
#0 lore raw
Quoted 1 line

From 520698096436f7da5b9142e63e3bed5580c5f14e Mon Sep 17 00:00:00 2001

From: David Teigland <[email protected]>
Date: Thu, 2 Nov 2006 09:49:02 -0600
Subject: [PATCH] [DLM] res_recover_locks_count not reset when recover_locks is aborted

Red Hat BZ 213684

If a node sends an lkb to the new master (RCOM_LOCK message) during recovery and recovery is then aborted on both nodes before it gets a reply, the res_recover_locks_count needs to be reset to 0 so that when the subsequent recovery comes along and sends the lkb to the new master again the assertion doesn't trigger that checks that counter is zero.

---
 fs/dlm/recover.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
fs/dlm/recover.c +1 -0
index a5e6d18..cf9f683 100644
@@ -252,6 +252,7 @@ static void recover_list_clear(struct dl
 	spin_lock(&ls->ls_recover_list_lock);
 	list_for_each_entry_safe(r, s, &ls->ls_recover_list, res_recover_list) {
 		list_del_init(&r->res_recover_list);
+		r->res_recover_locks_count = 0;
 		dlm_put_rsb(r);
 		ls->ls_recover_list_count--;
 	}
Signature · 1 line
1.4.1