Whamcloud - gitweb
LU-14586 tests: set mpi np correctly 17/43217/2
authorElena Gryaznova <elena.gryaznova@hpe.com>
Tue, 6 Apr 2021 08:05:02 +0000 (11:05 +0300)
committerOleg Drokin <green@whamcloud.com>
Wed, 2 Jun 2021 17:48:26 +0000 (17:48 +0000)
The number of mpi processes is to be calculated
based on the number of clients in clients subset.

Fixes: 9ecb000 ("LU-13281 tests: ha.sh improvements")
Test-Parameters: trivial
Signed-off-by: Elenai Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id: LUS-9716
Reviewed-by: Andriy Skulysh <andriy.skulysh@hpe.com>
Reviewed-by: Alexander Boyko <alexander.boyko@hpe.com>
Change-Id: If574743e2e29a309a8d7a021056fa726495fa959
Reviewed-on: https://review.whamcloud.com/43217
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Vladimir Saveliev <c17830@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/ha.sh

index 411337a..f356345 100755 (executable)
@@ -479,7 +479,7 @@ ha_repeat_mpi_load()
                ha_on $client $LFS getstripe $dir &&
                ha_on $client chmod a+xwr $dir &&
                ha_on $client "su $mpiuser sh -c \" $mpirun $mpirunoptions \
                ha_on $client $LFS getstripe $dir &&
                ha_on $client chmod a+xwr $dir &&
                ha_on $client "su $mpiuser sh -c \" $mpirun $mpirunoptions \
-                       -np $((${#ha_clients[@]} * mpi_threads_per_client )) \
+                       -np $((${#ha_clients[@]} * mpi_threads_per_client / ha_nclientsset)) \
                        $machines $cmd \" " || rc=$?
                [[ -n "$ha_postcmd" ]] && ha_info "$ha_postcmd" &&
                        ha_on $client "$ha_postcmd" >>"$log" 2>&1
                        $machines $cmd \" " || rc=$?
                [[ -n "$ha_postcmd" ]] && ha_info "$ha_postcmd" &&
                        ha_on $client "$ha_postcmd" >>"$log" 2>&1