Whamcloud - gitweb
LU-8066 lod: replace class_process_proc_param()
[fs/lustre-release.git] / lustre / lod / lod_dev.c
index eb7192c..767b850 100644 (file)
@@ -213,6 +213,7 @@ static struct lu_object *lod_object_alloc(const struct lu_env *env,
        if (lod_obj == NULL)
                RETURN(ERR_PTR(-ENOMEM));
 
+       mutex_init(&lod_obj->ldo_layout_mutex);
        lu_obj = lod2lu_obj(lod_obj);
        dt_object_init(&lod_obj->ldo_obj, NULL, dev);
        lod_obj->ldo_obj.do_ops = &lod_obj_ops;
@@ -960,6 +961,7 @@ static int lod_process_config(const struct lu_env *env,
 
        case LCFG_PARAM: {
                struct obd_device *obd;
+               ssize_t count;
                char *param;
 
                /* Check if it is activate/deactivate mdc
@@ -1032,16 +1034,13 @@ static int lod_process_config(const struct lu_env *env,
                }
 
 
-               obd = lod2obd(lod);
                if (strstr(param, PARAM_LOD) != NULL)
-                       rc = class_process_proc_param(PARAM_LOD, obd->obd_vars,
-                                             lcfg, obd);
+                       count = class_modify_config(lcfg, PARAM_LOD,
+                                                   &lod->lod_dt_dev.dd_kobj);
                else
-                       rc = class_process_proc_param(PARAM_LOV, obd->obd_vars,
-                                             lcfg, obd);
-               if (rc > 0)
-                       rc = 0;
-
+                       count = class_modify_config(lcfg, PARAM_LOV,
+                                                   &lod->lod_dt_dev.dd_kobj);
+               rc = count > 0 ? 0 : count;
                GOTO(out, rc);
        }
        case LCFG_PRE_CLEANUP: {
@@ -1262,6 +1261,30 @@ static int lod_root_get(const struct lu_env *env,
        return dt_root_get(env, dt2lod_dev(dev)->lod_child, f);
 }
 
+static void lod_statfs_sum(struct obd_statfs *sfs,
+                            struct obd_statfs *ost_sfs, int *bs)
+{
+       while (ost_sfs->os_bsize < *bs) {
+               *bs >>= 1;
+               sfs->os_bsize >>= 1;
+               sfs->os_bavail <<= 1;
+               sfs->os_blocks <<= 1;
+               sfs->os_bfree <<= 1;
+               sfs->os_granted <<= 1;
+       }
+       while (ost_sfs->os_bsize > *bs) {
+               ost_sfs->os_bsize >>= 1;
+               ost_sfs->os_bavail <<= 1;
+               ost_sfs->os_blocks <<= 1;
+               ost_sfs->os_bfree <<= 1;
+               ost_sfs->os_granted <<= 1;
+       }
+       sfs->os_bavail += ost_sfs->os_bavail;
+       sfs->os_blocks += ost_sfs->os_blocks;
+       sfs->os_bfree += ost_sfs->os_bfree;
+       sfs->os_granted += ost_sfs->os_granted;
+}
+
 /**
  * Implementation of dt_device_operations::dt_statfs() for LOD
  *
@@ -1270,7 +1293,73 @@ static int lod_root_get(const struct lu_env *env,
 static int lod_statfs(const struct lu_env *env,
                      struct dt_device *dev, struct obd_statfs *sfs)
 {
-       return dt_statfs(env, dt2lod_dev(dev)->lod_child, sfs);
+       struct lod_device   *lod = dt2lod_dev(dev);
+       struct lod_ost_desc *ost;
+       struct lod_mdt_desc *mdt;
+       struct obd_statfs    ost_sfs;
+       int i, rc, bs;
+       bool mdtonly;
+
+       rc = dt_statfs(env, dt2lod_dev(dev)->lod_child, sfs);
+       if (rc)
+               GOTO(out, rc);
+
+       bs = sfs->os_bsize;
+
+       sfs->os_bavail = 0;
+       sfs->os_blocks = 0;
+       sfs->os_bfree = 0;
+       sfs->os_granted = 0;
+
+       lod_getref(&lod->lod_mdt_descs);
+       lod_foreach_mdt(lod, i) {
+               mdt = MDT_TGT(lod, i);
+               LASSERT(mdt && mdt->ltd_mdt);
+               rc = dt_statfs(env, mdt->ltd_mdt, &ost_sfs);
+               /* ignore errors */
+               if (rc)
+                       continue;
+               sfs->os_files += ost_sfs.os_files;
+               sfs->os_ffree += ost_sfs.os_ffree;
+               lod_statfs_sum(sfs, &ost_sfs, &bs);
+       }
+       lod_putref(lod, &lod->lod_mdt_descs);
+
+       /* at some point we can check whether DoM is enabled and
+        * decide how to account MDT space. for simplicity let's
+        * just fallback to pre-DoM policy if any OST is alive */
+       mdtonly = true;
+
+       lod_getref(&lod->lod_ost_descs);
+       lod_foreach_ost(lod, i) {
+               ost = OST_TGT(lod, i);
+               LASSERT(ost && ost->ltd_ost);
+               rc = dt_statfs(env, ost->ltd_ost, &ost_sfs);
+               /* ignore errors */
+               if (rc || ost_sfs.os_bsize == 0)
+                       continue;
+               if (mdtonly) {
+                       /* if only MDTs and DoM report MDT space,
+                        * otherwise only OST space */
+                       sfs->os_bavail = 0;
+                       sfs->os_blocks = 0;
+                       sfs->os_bfree = 0;
+                       sfs->os_granted = 0;
+                       mdtonly = false;
+               }
+               ost_sfs.os_bavail += ost_sfs.os_granted;
+               lod_statfs_sum(sfs, &ost_sfs, &bs);
+               LASSERTF(bs == ost_sfs.os_bsize, "%d != %d\n",
+                       (int)sfs->os_bsize, (int)ost_sfs.os_bsize);
+       }
+       lod_putref(lod, &lod->lod_ost_descs);
+       sfs->os_state |= OS_STATE_SUM;
+
+       /* a single successful statfs should be enough */
+       rc = 0;
+
+out:
+       RETURN(rc);
 }
 
 /**
@@ -1408,11 +1497,16 @@ static int lod_sync(const struct lu_env *env, struct dt_device *dev)
        lod_foreach_ost(lod, i) {
                ost = OST_TGT(lod, i);
                LASSERT(ost && ost->ltd_ost);
+               if (!ost->ltd_active)
+                       continue;
                rc = dt_sync(env, ost->ltd_ost);
                if (rc) {
-                       CERROR("%s: can't sync ost %u: %d\n",
-                              lod2obd(lod)->obd_name, i, rc);
-                       break;
+                       if (rc != -ENOTCONN) {
+                               CERROR("%s: can't sync ost %u: %d\n",
+                                      lod2obd(lod)->obd_name, i, rc);
+                               break;
+                       }
+                       rc = 0;
                }
        }
        lod_putref(lod, &lod->lod_ost_descs);
@@ -1424,11 +1518,16 @@ static int lod_sync(const struct lu_env *env, struct dt_device *dev)
        lod_foreach_mdt(lod, i) {
                mdt = MDT_TGT(lod, i);
                LASSERT(mdt && mdt->ltd_mdt);
+               if (!mdt->ltd_active)
+                       continue;
                rc = dt_sync(env, mdt->ltd_mdt);
                if (rc) {
-                       CERROR("%s: can't sync mdt %u: %d\n",
-                              lod2obd(lod)->obd_name, i, rc);
-                       break;
+                       if (rc != -ENOTCONN) {
+                               CERROR("%s: can't sync mdt %u: %d\n",
+                                      lod2obd(lod)->obd_name, i, rc);
+                               break;
+                       }
+                       rc = 0;
                }
        }
        lod_putref(lod, &lod->lod_mdt_descs);
@@ -1727,6 +1826,15 @@ static struct lu_device *lod_device_alloc(const struct lu_env *env,
        return lu_dev;
 }
 
+static void lod_avoid_guide_fini(struct lod_avoid_guide *lag)
+{
+       if (lag->lag_oss_avoid_array)
+               OBD_FREE(lag->lag_oss_avoid_array,
+                        sizeof(__u32) * lag->lag_oaa_size);
+       if (lag->lag_ost_avoid_bitmap)
+               CFS_FREE_BITMAP(lag->lag_ost_avoid_bitmap);
+}
+
 /**
  * Implementation of lu_device_type_operations::ldto_device_fini() for LOD
  *
@@ -1851,7 +1959,6 @@ static void lod_key_fini(const struct lu_context *ctx,
        struct lod_thread_info *info = data;
        struct lod_layout_component *lds =
                                info->lti_def_striping.lds_def_comp_entries;
-       struct ost_pool *inuse = &info->lti_inuse_osts;
 
        /* allocated in lod_get_lov_ea
         * XXX: this is overload, a tread may have such store but used only
@@ -1867,13 +1974,12 @@ static void lod_key_fini(const struct lu_context *ctx,
        if (lds != NULL)
                lod_free_def_comp_entries(&info->lti_def_striping);
 
-       if (inuse->op_size)
-               OBD_FREE(inuse->op_array, inuse->op_size);
-
        if (info->lti_comp_size > 0)
                OBD_FREE(info->lti_comp_idx,
                         info->lti_comp_size * sizeof(__u32));
 
+       lod_avoid_guide_fini(&info->lti_avoid);
+
        OBD_FREE_PTR(info);
 }
 
@@ -2037,7 +2143,7 @@ static int lod_obd_set_info_async(const struct lu_env *env,
 
 
        if (no_set) {
-               rc2 = ptlrpc_set_wait(set);
+               rc2 = ptlrpc_set_wait(env, set);
                if (rc2 == 0 && rc == 0)
                        rc = rc2;
                ptlrpc_set_destroy(set);