Whamcloud - gitweb
LU-6606 tests: delete memory limit from obdfilter-survey 23/14823/4
authorAlexander Boyko <alexander.boyko@seagate.com>
Fri, 15 May 2015 15:20:20 +0000 (18:20 +0300)
committerOleg Drokin <oleg.drokin@intel.com>
Sat, 30 May 2015 02:43:28 +0000 (02:43 +0000)
This limit prevents to do enough load on newer HW, and have no
relation to current Lustre code. It is safe to remove this limit.

For disk usage the echo_client_brw_ioctl() limit the npages to
PTLRPC_MAX_BRW_SIZE>>PAGE_SHIFT. The total transfer is divided on
small portion with ptlrpc transfer size. Echo client will return
ENOMEM for bad memory allocation. And obdfilter-survey .detail file
will have the next error message
error: test_brw-1: #1 - Cannot allocate memory on write

Signed-off-by: Alexander Boyko <alexander.boyko@seagate.com>
Xyratex-bug-id: MRP-1642
Change-Id: I83d5b811cfa34dd3ec60fb670e595af193495b1c
Reviewed-on: http://review.whamcloud.com/14823
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
lustre-iokit/obdfilter-survey/obdfilter-survey

index 1dc00db..23e8189 100755 (executable)
@@ -303,9 +303,6 @@ restart_nobj=1
 PAGE_SIZE=${PAGE_SIZE:-$(($(getconf PAGE_SIZE) / 1024))}
 PAGE_SIZE=${PAGE_SIZE:-4}
 
-# max buffer_mem (total_threads * buffer size)
-# (to avoid lctl ENOMEM problems)
-max_buffer_mem=$((1024 * 1024))
 snap=1
 clean_srv_OSS=0
 # Customisation variables ends here.
@@ -473,8 +470,7 @@ if (($ndevs <= 0 || ${#host_names[@]} <= 0)); then
        echo "no devices or hosts specified"
        cleanup 0 $clean_srv_OSS $cleanup_oscs
 fi
-# Buffers will be spread out among all hosts, so allow for that
-max_buffer_mem=$(( ${max_buffer_mem} * ${#unique_hosts[@]} ))
+
 print_summary "$(date) Obdfilter-survey for case=$case from $(hostname)"
 for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
        for ((nobj = $nobjlo; nobj <= $nobjhi; nobj*=2)); do
@@ -509,10 +505,6 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
                              $ndevs $total_size $actual_rsz $total_nobj $total_thr)
                        echo "=======================> $str" >> $workf
                        print_summary -n "$str"
-                       if ((total_thr * actual_rsz > max_buffer_mem)); then
-                               print_summary "Too much buffer space"
-                               continue
-                       fi
 
                        # create the objects
                        tmpf="${workf}_tmp"