LU-15195 ofd: missing OST object

[fs/lustre-release.git] / lustre / obdclass / lu_tgt_descs.c

diff --git a/lustre/obdclass/lu_tgt_descs.c b/lustre/obdclass/lu_tgt_descs.c
index 1f1cfae..d872db4 100644 (file)
--- a/lustre/obdclass/lu_tgt_descs.c
+++ b/lustre/obdclass/lu_tgt_descs.c
@@ -79,13 +79,6 @@ u64 lu_prandom_u64_max(u64 ep_ro)
 }
 EXPORT_SYMBOL(lu_prandom_u64_max);
 
-void lu_qos_rr_init(struct lu_qos_rr *lqr)
-{
-       spin_lock_init(&lqr->lqr_alloc);
-       set_bit(LQ_DIRTY, &lqr->lqr_flags);
-}
-EXPORT_SYMBOL(lu_qos_rr_init);
-
 /**
  * Add a new target to Quality of Service (QoS) target table.
  *
@@ -161,7 +154,9 @@ int lu_qos_add_tgt(struct lu_qos *qos, struct lu_tgt_desc *tgt)
        list_add_tail(&svr->lsq_svr_list, &tempsvr->lsq_svr_list);
 
        set_bit(LQ_DIRTY, &qos->lq_flags);
+#ifdef HAVE_SERVER_SUPPORT
        set_bit(LQ_DIRTY, &qos->lq_rr.lqr_flags);
+#endif
 out:
        up_write(&qos->lq_rw_sem);
        RETURN(rc);
@@ -202,7 +197,9 @@ static int lu_qos_del_tgt(struct lu_qos *qos, struct lu_tgt_desc *ltd)
        }
 
        set_bit(LQ_DIRTY, &qos->lq_flags);
+#ifdef HAVE_SERVER_SUPPORT
        set_bit(LQ_DIRTY, &qos->lq_rr.lqr_flags);
+#endif
 out:
        up_write(&qos->lq_rw_sem);
        RETURN(rc);
@@ -231,14 +228,15 @@ static inline __u64 tgt_statfs_iavail(struct lu_tgt_desc *tgt)
 void lu_tgt_qos_weight_calc(struct lu_tgt_desc *tgt)
 {
        struct lu_tgt_qos *ltq = &tgt->ltd_qos;
-       __u64 temp, temp2;
+       __u64 penalty;
 
-       temp = (tgt_statfs_bavail(tgt) >> 16) * (tgt_statfs_iavail(tgt) >> 8);
-       temp2 = ltq->ltq_penalty + ltq->ltq_svr->lsq_penalty;
-       if (temp < temp2)
+       ltq->ltq_avail = (tgt_statfs_bavail(tgt) >> 16) *
+                        (tgt_statfs_iavail(tgt) >> 8);
+       penalty = ltq->ltq_penalty + ltq->ltq_svr->lsq_penalty;
+       if (ltq->ltq_avail < penalty)
                ltq->ltq_weight = 0;
        else
-               ltq->ltq_weight = temp - temp2;
+               ltq->ltq_weight = ltq->ltq_avail - penalty;
 }
 EXPORT_SYMBOL(lu_tgt_qos_weight_calc);
 
@@ -276,15 +274,21 @@ int lu_tgt_descs_init(struct lu_tgt_descs *ltd, bool is_mdt)
        init_rwsem(&ltd->ltd_qos.lq_rw_sem);
        set_bit(LQ_DIRTY, &ltd->ltd_qos.lq_flags);
        set_bit(LQ_RESET, &ltd->ltd_qos.lq_flags);
-       /* Default priority is toward free space balance */
-       ltd->ltd_qos.lq_prio_free = 232;
-       /* Default threshold for rr (roughly 17%) */
-       ltd->ltd_qos.lq_threshold_rr = 43;
        ltd->ltd_is_mdt = is_mdt;
-       if (is_mdt)
+       /* MDT imbalance threshold is low to balance across MDTs
+        * relatively quickly, because each directory may result
+        * in a large number of files/subdirs created therein.
+        */
+       if (is_mdt) {
                ltd->ltd_lmv_desc.ld_pattern = LMV_HASH_TYPE_DEFAULT;
-
-       lu_qos_rr_init(&ltd->ltd_qos.lq_rr);
+               ltd->ltd_qos.lq_prio_free = LMV_QOS_DEF_PRIO_FREE * 256 / 100;
+               ltd->ltd_qos.lq_threshold_rr =
+                       LMV_QOS_DEF_THRESHOLD_RR_PCT * 256 / 100;
+       } else {
+               ltd->ltd_qos.lq_prio_free = LOV_QOS_DEF_PRIO_FREE * 256 / 100;
+               ltd->ltd_qos.lq_threshold_rr =
+                       LOV_QOS_DEF_THRESHOLD_RR_PCT * 256 / 100;
+       }
 
        return 0;
 }
@@ -419,22 +423,6 @@ void ltd_del_tgt(struct lu_tgt_descs *ltd, struct lu_tgt_desc *tgt)
 EXPORT_SYMBOL(ltd_del_tgt);
 
 /**
- * Whether QoS data is up-to-date and QoS can be applied.
- */
-bool ltd_qos_is_usable(struct lu_tgt_descs *ltd)
-{
-       if (!test_bit(LQ_DIRTY, &ltd->ltd_qos.lq_flags) && 
-            test_bit(LQ_SAME_SPACE, &ltd->ltd_qos.lq_flags))
-               return false;
-
-       if (ltd->ltd_lov_desc.ld_active_tgt_count < 2)
-               return false;
-
-       return true;
-}
-EXPORT_SYMBOL(ltd_qos_is_usable);
-
-/**
  * Calculate penalties per-tgt and per-server
  *
  * Re-calculate penalties when the configuration changes, active targets
@@ -649,7 +637,7 @@ int ltd_qos_update(struct lu_tgt_descs *ltd, struct lu_tgt_desc *tgt,
        ltq->ltq_penalty += ltq->ltq_penalty_per_obj *
                            ltd->ltd_lov_desc.ld_active_tgt_count;
        svr->lsq_penalty += svr->lsq_penalty_per_obj *
-                           ltd->ltd_lov_desc.ld_active_tgt_count;
+                           qos->lq_active_svr_count;
 
        /* Decrease all MDS penalties */
        list_for_each_entry(svr, &qos->lq_svr_list, lsq_svr_list) {