update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / vhost / migration / migration-tc1.sh

diff --git a/ceph/src/spdk/test/vhost/migration/migration-tc1.sh b/ceph/src/spdk/test/vhost/migration/migration-tc1.sh
index cdfb7a3118708e7907614a0fc58cbd59fdca9d72..6d5a436efa43d417e0f1de7631b79b32adbd7d17 100644 (file)
--- a/ceph/src/spdk/test/vhost/migration/migration-tc1.sh
+++ b/ceph/src/spdk/test/vhost/migration/migration-tc1.sh
@@ -1,43 +1,40 @@
-function migration_tc1_clean_vhost_config()
-{
+function migration_tc1_clean_vhost_config() {
        # Restore trap
        trap 'error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
 
        notice "Removing vhost devices & controllers via RPC ..."
        # Delete bdev first to remove all LUNs and SCSI targets
-       $rpc delete_malloc_bdev Malloc0
+       $rpc bdev_malloc_delete Malloc0
 
        # Delete controllers
-       $rpc remove_vhost_controller $incoming_vm_ctrlr
-       $rpc remove_vhost_controller $target_vm_ctrlr
+       $rpc vhost_delete_controller $incoming_vm_ctrlr
+       $rpc vhost_delete_controller $target_vm_ctrlr
 
        unset -v incoming_vm target_vm incoming_vm_ctrlr target_vm_ctrlr rpc
 }
 
-function migration_tc1_configure_vhost()
-{
+function migration_tc1_configure_vhost() {
        # Those are global intentionally - they will be unset in cleanup handler
        incoming_vm=0
        target_vm=1
        incoming_vm_ctrlr=naa.Malloc0.$incoming_vm
        target_vm_ctrlr=naa.Malloc0.$target_vm
-       rpc="$rootdir/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
+       rpc="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
 
        trap 'migration_tc1_error_handler; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
 
        # Construct shared Malloc Bdev
-       $rpc construct_malloc_bdev -b Malloc0 128 4096
+       $rpc bdev_malloc_create -b Malloc0 128 4096
 
        # And two controllers - one for each VM. Both are using the same Malloc Bdev as LUN 0
-       $rpc construct_vhost_scsi_controller $incoming_vm_ctrlr
-       $rpc add_vhost_scsi_lun $incoming_vm_ctrlr 0 Malloc0
+       $rpc vhost_create_scsi_controller $incoming_vm_ctrlr
+       $rpc vhost_scsi_controller_add_target $incoming_vm_ctrlr 0 Malloc0
 
-       $rpc construct_vhost_scsi_controller $target_vm_ctrlr
-       $rpc add_vhost_scsi_lun $target_vm_ctrlr 0 Malloc0
+       $rpc vhost_create_scsi_controller $target_vm_ctrlr
+       $rpc vhost_scsi_controller_add_target $target_vm_ctrlr 0 Malloc0
 }
 
-function migration_tc1_error_handler()
-{
+function migration_tc1_error_handler() {
        trap - SIGINT ERR EXIT
        warning "Migration TC1 ERROR HANDLER"
        print_backtrace
@@ -49,15 +46,16 @@ function migration_tc1_error_handler()
        warning "Migration TC1 FAILED"
 }
 
-function migration_tc1()
-{
+function migration_tc1() {
        # Use 2 VMs:
        # incoming VM - the one we want to migrate
        # targe VM - the one which will accept migration
        local job_file="$testdir/migration-tc1.job"
+       local log_file
+       log_file="/root/$(basename ${job_file%%.*}).log"
 
        # Run vhost
-       vhost_run
+       vhost_run 0
        migration_tc1_configure_vhost
 
        notice "Setting up VMs"
@@ -74,14 +72,14 @@ function migration_tc1()
        notice "Starting FIO"
 
        vm_check_scsi_location $incoming_vm
-       run_fio $fio_bin --job-file="$job_file" --local --vm="${incoming_vm}$(printf ':/dev/%s' $SCSI_DISK)"
+       run_fio $fio_bin --job-file="$job_file" --no-wait-for-fio --local --vm="${incoming_vm}$(printf ':/dev/%s' $SCSI_DISK)"
 
        # Wait a while to let the FIO time to issue some IO
        sleep 5
 
        # Check if fio is still running before migration
        if ! is_fio_running $incoming_vm; then
-               vm_ssh $incoming_vm "cat /root/$(basename ${job_file}).out"
+               vm_exec $incoming_vm "cat $log_file"
                error "FIO is not running before migration: process crashed or finished too early"
        fi
 
@@ -90,7 +88,7 @@ function migration_tc1()
 
        # Check if fio is still running after migration
        if ! is_fio_running $target_vm; then
-               vm_ssh $target_vm "cat /root/$(basename ${job_file}).out"
+               vm_exec $target_vm "cat $log_file"
                error "FIO is not running after migration: process crashed or finished too early"
        fi
 
@@ -99,13 +97,13 @@ function migration_tc1()
        while is_fio_running $target_vm; do
                sleep 1
                echo -n "."
-               if (( timeout-- == 0 )); then
+               if ((timeout-- == 0)); then
                        error "timeout while waiting for FIO!"
                fi
        done
 
        notice "Fio result is:"
-       vm_ssh $target_vm "cat /root/$(basename ${job_file}).out"
+       vm_exec $target_vm "cat $log_file"
 
        notice "Migration DONE"
 
@@ -115,9 +113,7 @@ function migration_tc1()
        migration_tc1_clean_vhost_config
 
        notice "killing vhost app"
-       vhost_kill
+       vhost_kill 0
 
        notice "Migration TC1 SUCCESS"
 }
-
-migration_tc1