[DLM] fix aborted recovery during node removal

Red Hat BZ 211914

With the new cluster infrastructure, dlm recovery for a node removal can
be aborted and restarted for a node addition.  When this happens, the
restarted recovery isn't aware that it's doing recovery for the earlier
removal as well as the addition.  So, it then skips the recovery steps
only required when nodes are removed.  This can result in locks not being
purged for failed/removed nodes.  The fix is to check for removed nodes
for which recovery has not been completed at the start of a new recovery
sequence.

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 362e3eff4dc9..4a1d6023fd9b 100644
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -164,6 +164,13 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
                  */
 
                 dlm_recover_rsbs(ls);
+        } else {
+                /*
+                 * Other lockspace members may be going through the "neg" steps
+                 * while also adding us to the lockspace, in which case they'll
+                 * be looking for this status bit during dlm_recover_locks().
+                 */
+                dlm_set_recover_status(ls, DLM_RS_LOCKS);
         }
 
         dlm_release_root_list(ls);