Branch b1_6

b=13375
i=shadow, panda

Descriptoin: make lov_create() will not stuck in obd_statfs_rqset()
Details    : If an OST is down the MDS will hang indefinitely in
             obd_statfs_rqset() waiting for the statfs data. While for
             MDS QOS usage of statfs, it should not stuck in waiting.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index f910d1f..73ef20b 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -19,6 +19,13 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : normal
+Bugzilla   : 13375
+Descriptoin: make lov_create() will not stuck in obd_statfs_rqset()
+Details    : If an OST is down the MDS will hang indefinitely in
+             obd_statfs_rqset() waiting for the statfs data. While for
+             MDS QOS usage of statfs, it should not stuck in waiting.
+
+Severity   : normal
 Bugzilla   : 3055
 Description: Disable adaptive timeouts by default
 

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 8885f8f..ffdab5e 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -1140,7 +1140,7 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
         }
 
         maxage = cfs_time_shift_64(-lov->desc.ld_qos_maxage);
-        obd_statfs_rqset(exp->exp_obd, &osfs, maxage, 0);
+        obd_statfs_rqset(exp->exp_obd, &osfs, maxage, OBD_STATFS_NODELAY);
 
         rc = lov_prep_create_set(exp, &oinfo, ea, src_oa, oti, &set);
         if (rc)