There are couple of problems in obdfilter-survey:
- Type of test brw i.e. "g" was not followed with npages,
- Target netdisk was not set properly and
- Turn ON async flag only for mode 3.
This patch fixed the above mention problems.
Signed-off-by: Rahul Deshmukh <rahul_deshmukh@xyratex.com>
Change-Id: I4360b52d1b8d828def6cf316abc09383fcaaaa94
Reviewed-on: http://review.whamcloud.com/10264
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Cliff White <cliff.white@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
# for "echo_client + osc" case, "BRW" mode should be used
testcase2mode() {
case $case in
# for "echo_client + osc" case, "BRW" mode should be used
testcase2mode() {
case $case in
"$lctl > $tmpfi 2>&1 \\
--threads $thr -$snap $devno \\
test_brw $count `testname2type $test` q $pages \\
"$lctl > $tmpfi 2>&1 \\
--threads $thr -$snap $devno \\
test_brw $count `testname2type $test` q $pages \\
- ${thr_per_obj}t${first_obj} `testcase2mode $pages` &"
+ ${thr_per_obj}t${first_obj} `testcase2mode`$pages &"
done
pidcount=0
for host in ${unique_hosts[@]}; do
done
pidcount=0
for host in ${unique_hosts[@]}; do
struct obdo *oa = &data->ioc_obdo1;
struct echo_object *eco;
int rc;
struct obdo *oa = &data->ioc_obdo1;
struct echo_object *eco;
int rc;
/* OFD/obdfilter works only via prep/commit */
test_mode = (long)data->ioc_pbuf1;
/* OFD/obdfilter works only via prep/commit */
test_mode = (long)data->ioc_pbuf1;
- if (test_mode == 1)
- async = 0;
-
if (ed->ed_next == NULL && test_mode != 3) {
test_mode = 3;
data->ioc_plen1 = data->ioc_count;
}
if (ed->ed_next == NULL && test_mode != 3) {
test_mode = 3;
data->ioc_plen1 = data->ioc_count;
}
+ if (test_mode == 3)
+ async = 1;
+
/* Truncate batch size to maximum */
if (data->ioc_plen1 > PTLRPC_MAX_BRW_SIZE)
data->ioc_plen1 = PTLRPC_MAX_BRW_SIZE;
/* Truncate batch size to maximum */
if (data->ioc_plen1 > PTLRPC_MAX_BRW_SIZE)
data->ioc_plen1 = PTLRPC_MAX_BRW_SIZE;
for d in $devs; do
# if oss is local -- obdfilter-survey needs dev wo/ host
target=$d
for d in $devs; do
# if oss is local -- obdfilter-survey needs dev wo/ host
target=$d
- [[ $oss = `hostname` && "$1" == "netdisk" ]] || target=$nid:$target
+ [[ $oss = `hostname` && "$1" == "disk" ]] || target=$nid:$target
targets="$targets $target"
done
done
targets="$targets $target"
done
done