Whamcloud - gitweb
LU-8990 lod: put root at cleanup 31/31431/3
authorLai Siyao <lai.siyao@intel.com>
Fri, 2 Feb 2018 15:00:15 +0000 (23:00 +0800)
committerJohn L. Hammond <john.hammond@intel.com>
Thu, 5 Apr 2018 19:56:07 +0000 (19:56 +0000)
'lod_md_root' was put at precleanup, but soak test shows there exists
race, and some ongoing request may re-initialize it, move this put
to cleanup.

Also add debug code to dump remaining objects if lod device is still
referenced at lod_device_free().

Lustre-change: https://review.whamcloud.com/31143
Lustre-commit: 94fc345399b3cd94a96aa4b3f607f2dc9d669a98

Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Change-Id: I6f1ab0ba149ccf95279c1182c90a5588607ad8fa
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/31431
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
lustre/lod/lod_dev.c

index 8d95026..cf31d19 100644 (file)
@@ -1031,11 +1031,6 @@ static int lod_process_config(const struct lu_env *env,
                GOTO(out, rc);
        }
        case LCFG_PRE_CLEANUP: {
-               if (lod->lod_md_root != NULL) {
-                       dt_object_put(env, &lod->lod_md_root->ldo_obj);
-                       lod->lod_md_root = NULL;
-               }
-
                lod_sub_process_config(env, lod, &lod->lod_mdt_descs, lcfg);
                lod_sub_process_config(env, lod, &lod->lod_ost_descs, lcfg);
                next = &lod->lod_child->dd_lu_dev;
@@ -1050,6 +1045,11 @@ static int lod_process_config(const struct lu_env *env,
                break;
        }
        case LCFG_CLEANUP: {
+               if (lod->lod_md_root != NULL) {
+                       dt_object_put(env, &lod->lod_md_root->ldo_obj);
+                       lod->lod_md_root = NULL;
+               }
+
                /*
                 * do cleanup on underlying storage only when
                 * all OSPs are cleaned up, as they use that OSD as well
@@ -1669,6 +1669,11 @@ static struct lu_device *lod_device_free(const struct lu_env *env,
        struct lu_device  *next = &lod->lod_child->dd_lu_dev;
        ENTRY;
 
+       if (atomic_read(&lu->ld_ref) > 0 &&
+           !cfs_hash_is_empty(lu->ld_site->ls_obj_hash)) {
+               LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL);
+               lu_site_print(env, lu->ld_site, &msgdata, lu_cdebug_printer);
+       }
        LASSERTF(atomic_read(&lu->ld_ref) == 0, "lu is %p\n", lu);
        dt_device_fini(&lod->lod_dt_dev);
        OBD_FREE_PTR(lod);