X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_qos.c;h=e7b1de0771ab536982500ba27d0f8ffdb6d91a28;hb=9699de55bfa4a35aea21f713b80d33ec2f9329fe;hp=2b81ad840839925ca2fcebbd89e859a56c38b5cc;hpb=42472bb9507816a5fd413bc69b17a4fe8ff92d3c;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_qos.c b/lustre/lod/lod_qos.c
index 2b81ad8..e7b1de0 100644
--- a/lustre/lod/lod_qos.c
+++ b/lustre/lod/lod_qos.c
@@ -23,7 +23,7 @@
  * Copyright  2009 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -175,7 +175,9 @@ static int lod_statfs_and_check(const struct lu_env *env, struct lod_device *d,
 		spin_unlock(&d->lod_desc_lock);
 	} else if (rc == 0 && ost->ltd_active == 0) {
 		/* turned active? */
-		LASSERT(d->lod_desc.ld_active_tgt_count < d->lod_ostnr);
+		LASSERTF(d->lod_desc.ld_active_tgt_count < d->lod_ostnr,
+			 "active tgt count %d, ost nr %d\n",
+			 d->lod_desc.ld_active_tgt_count, d->lod_ostnr);
 		spin_lock(&d->lod_desc_lock);
 		if (ost->ltd_active == 0) {
 			ost->ltd_active = 1;
@@ -188,7 +190,7 @@ static int lod_statfs_and_check(const struct lu_env *env, struct lod_device *d,
 		spin_unlock(&d->lod_desc_lock);
 	}
 
-	return rc;
+	RETURN(rc);
 }
 
 static void lod_qos_statfs_update(const struct lu_env *env,
@@ -225,6 +227,7 @@ static void lod_qos_statfs_update(const struct lu_env *env,
 
 out:
 	up_write(&lod->lod_qos.lq_rw_sem);
+	EXIT;
 }
 
 /* Recalculate per-object penalties for OSSs and OSTs,
@@ -629,7 +632,7 @@ static inline int lod_qos_ost_in_use_clear(const struct lu_env *env, int stripes
 		CERROR("can't allocate memory for ost-in-use array\n");
 		return -ENOMEM;
 	}
-	memset(info->lti_ea_store, 0, sizeof(int) * stripes);
+	memset(info->lti_ea_store, -1, sizeof(int) * stripes);
 	return 0;
 }
 
@@ -918,6 +921,7 @@ repeat_find:
 		/*
 		 * We've successfuly declared (reserved) an object
 		 */
+		lod_qos_ost_in_use(env, stripe_num, ost_idx);
 		stripe[stripe_num] = o;
 		stripe_num++;
 
@@ -1207,41 +1211,40 @@ static int lod_use_defined_striping(const struct lu_env *env,
 				    struct lod_object *mo,
 				    const struct lu_buf *buf)
 {
-	struct lod_device      *d = lu2lod_dev(lod2lu_obj(mo)->lo_dev);
 	struct lov_mds_md_v1   *v1 = buf->lb_buf;
 	struct lov_mds_md_v3   *v3 = buf->lb_buf;
 	struct lov_ost_data_v1 *objs;
 	__u32			magic;
-	int			rc;
+	int			rc = 0;
 	ENTRY;
 
-	rc = lod_verify_striping(d, buf, 1);
-	if (rc)
-		RETURN(rc);
-
 	magic = le32_to_cpu(v1->lmm_magic);
 	if (magic == LOV_MAGIC_V1_DEF) {
+		magic = LOV_MAGIC_V1;
 		objs = &v1->lmm_objects[0];
 	} else if (magic == LOV_MAGIC_V3_DEF) {
+		magic = LOV_MAGIC_V3;
 		objs = &v3->lmm_objects[0];
 		lod_object_set_pool(mo, v3->lmm_pool_name);
 	} else {
 		GOTO(out, rc = -EINVAL);
 	}
 
-	/*
-	 * LOD shouldn't be aware of recovery at all,
-	 * but this track recovery status (to some extent)
-	 * to be do additional checks like this one
-	 */
-	LASSERT(d->lod_recovery_completed == 0);
-
+	mo->ldo_pattern = le32_to_cpu(v1->lmm_pattern);
 	mo->ldo_stripe_size = le32_to_cpu(v1->lmm_stripe_size);
 	mo->ldo_stripenr = le16_to_cpu(v1->lmm_stripe_count);
 	mo->ldo_layout_gen = le16_to_cpu(v1->lmm_layout_gen);
+
+	/* fixup for released file before object initialization */
+	if (mo->ldo_pattern & LOV_PATTERN_F_RELEASED) {
+		mo->ldo_released_stripenr = mo->ldo_stripenr;
+		mo->ldo_stripenr = 0;
+	}
+
 	LASSERT(buf->lb_len >= lov_mds_md_size(mo->ldo_stripenr, magic));
 
-	rc = lod_initialize_objects(env, mo, objs);
+	if (mo->ldo_stripenr > 0)
+		rc = lod_initialize_objects(env, mo, objs);
 
 out:
 	RETURN(rc);
@@ -1285,10 +1288,14 @@ static int lod_qos_parse_config(const struct lu_env *env,
 		RETURN(-EINVAL);
 	}
 
-	if (v1->lmm_pattern != 0 && v1->lmm_pattern != LOV_PATTERN_RAID0) {
+	v1->lmm_magic = magic;
+	if (v1->lmm_pattern == 0)
+		v1->lmm_pattern = LOV_PATTERN_RAID0;
+	if (lov_pattern(v1->lmm_pattern) != LOV_PATTERN_RAID0) {
 		CERROR("invalid pattern: %x\n", v1->lmm_pattern);
 		RETURN(-EINVAL);
 	}
+	lo->ldo_pattern = v1->lmm_pattern;
 
 	if (v1->lmm_stripe_size)
 		lo->ldo_stripe_size = v1->lmm_stripe_size;
@@ -1342,6 +1349,12 @@ static int lod_qos_parse_config(const struct lu_env *env,
 	} else
 		lod_object_set_pool(lo, NULL);
 
+	/* fixup for released file */
+	if (lo->ldo_pattern & LOV_PATTERN_F_RELEASED) {
+		lo->ldo_released_stripenr = lo->ldo_stripenr;
+		lo->ldo_stripenr = 0;
+	}
+
 	RETURN(0);
 }
 
@@ -1379,11 +1392,20 @@ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
 	if (rc)
 		GOTO(out, rc);
 
+	/* A released file is being created */
+	if (lo->ldo_stripenr == 0)
+		GOTO(out, rc = 0);
+
 	if (likely(lo->ldo_stripe == NULL)) {
 		/*
 		 * no striping has been created so far
 		 */
 		LASSERT(lo->ldo_stripenr > 0);
+		/*
+		 * statfs and check OST targets now, since ld_active_tgt_count
+		 * could be changed if some OSTs are [de]activated manually.
+		 */
+		lod_qos_statfs_update(env, d);
 		lo->ldo_stripenr = lod_get_stripecnt(d, LOV_MAGIC,
 				lo->ldo_stripenr);
 
@@ -1394,8 +1416,9 @@ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
 
 		lod_getref(&d->lod_ost_descs);
 		/* XXX: support for non-0 files w/o objects */
+		CDEBUG(D_OTHER, "tgt_count %d stripenr %d\n",
+				d->lod_desc.ld_tgt_count, stripe_len);
 		if (lo->ldo_def_stripe_offset >= d->lod_desc.ld_tgt_count) {
-			lod_qos_statfs_update(env, d);
 			rc = lod_alloc_qos(env, lo, stripe, flag, th);
 			if (rc == -EAGAIN)
 				rc = lod_alloc_rr(env, lo, stripe, flag, th);