LU-1303 mds: integration lod/osp into the stack

[fs/lustre-release.git] / lustre-iokit / mds-survey / mds-survey

diff --git a/lustre-iokit/mds-survey/mds-survey b/lustre-iokit/mds-survey/mds-survey
index 19536f2..ffa062e 100755 (executable)
--- a/lustre-iokit/mds-survey/mds-survey
+++ b/lustre-iokit/mds-survey/mds-survey
@@ -187,7 +187,7 @@ if (( $stripe_count > 0 )); then
     for ((i=0; i < $ndevs; i++)); do
         host=${host_names[$i]}
         obd=$(remote_shell $host $lctl device_list | awk "{if (\$2 == \"UP\" &&
-            \$3 == \"osc\") { print \$4 } }")
+            (\$3 == \"osc\" || \$3 == \"osp\")) { print \$4 } }")
         if [ -z "$obd" ]; then
             echo "Need obdfilter to test stripe_count"
             exit 1
@@ -267,6 +267,7 @@ for ((thr = $thrlo; thr <= $thrhi; thr*=2)); do
     if (( thr_per_dir <= 0 )); then
         continue
     fi
+    file_count_per_thread=$((${file_count}/${thr}))
     str=`printf 'mdt %1d file %7d dir %4d thr %4d ' \
     $ndevs $file_count $dir_count $thr`
     echo "=======================> $str" >> $workf
@@ -291,7 +292,7 @@ for ((thr = $thrlo; thr <= $thrhi; thr*=2)); do
             echo >> ${cmdsf}_${host}                                                     \
                 "$lctl > $tmpfi 2>&1                                                     \
                  --threads $thr -$snap $devno test_$test -d /$basedir -D $dir_count      \
-                 -b $start_number -n $file_count"
+                 -b $start_number -n $file_count_per_thread"
         done
         pidcount=0
         for host in ${unique_hosts[@]}; do