Branch b1_6

b=13125
i=nathan, deen

Description: osts not allocated evenly to files
Details    : change the condition to increase offset_idx

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 6c937ed..321b9a3 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -151,6 +151,11 @@ Bugzilla   : 12418
 Description: evictions taking too long
 Details    : allow llrd to evict clients directly on OSTs
 
+Severity   : normal 
+Bugzilla   : 13125
+Description: osts not allocated evenly to files
+Details    : change the condition to increase offset_idx 
+
 --------------------------------------------------------------------------------
 
 2007-08-27         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/lov/lov_qos.c b/lustre/lov/lov_qos.c
index cb102eb..a79353c 100644 (file)
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -517,7 +517,9 @@ static int alloc_rr(struct lov_obd *lov, int *idx_arr, int *stripe_cnt,
                 /* If we have allocated from all of the OSTs, slowly
                    precess the next start */
                 lov->lov_start_idx %= ost_count;
-                ++lov->lov_offset_idx;
+                if (stripe_cnt_min > 1 &&
+                    (ost_active_count % stripe_cnt_min != 1))
+                        ++lov->lov_offset_idx;
         }
         down_read(&lov->lov_qos.lq_rw_sem);
         ost_start_idx_temp = lov->lov_start_idx;