LU-6635 lfsck: block replacing the OST-object for test

[fs/lustre-release.git] / lustre / lfsck / lfsck_layout.c

diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c
index 06fb33c..56890b6 100644 (file)
--- a/lustre/lfsck/lfsck_layout.c
+++ b/lustre/lfsck/lfsck_layout.c
@@ -2089,6 +2089,11 @@ static int lfsck_layout_conflict_create(const struct lu_env *env,
        int                       rc            = 0;
        ENTRY;
 
+       while (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY3, cfs_fail_val)) {
+               if (unlikely(!thread_is_running(&com->lc_lfsck->li_thread)))
+                       RETURN(0);
+       }
+
        ostid_le_to_cpu(&slot->l_ost_oi, oi);
        rc = ostid_to_fid(cfid2, oi, ost_idx2);
        if (rc != 0)
@@ -5535,6 +5540,10 @@ static void lfsck_layout_assistant_fill_pos(const struct lu_env *env,
        struct lfsck_assistant_data     *lad = com->lc_data;
        struct lfsck_layout_req         *llr;
 
+       if (((struct lfsck_layout *)(com->lc_file_ram))->ll_status !=
+           LS_SCANNING_PHASE1)
+               return;
+
        if (list_empty(&lad->lad_req_list))
                return;