Commit a66c9ffd authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Ben Walker
Browse files

test/iscsi_tgt: Port config file from .INI to JSON in the FIO test 



Port the config file used in the FIO test from .INI to JSON.

Besides, set_bdev_nvme_hotplug RPC cannot be used easily because
the iSCSI target is not the primary process in the FIO test.

The FIO test doesn't use the hotplug feature and hence remove
enabling hotplug simply.

Change-Id: Idf8809aa829b67a7028f6fa4778a7aae1b431bb8
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/433223


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 33c517c5

test/iscsi_tgt/fio/fio.sh

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ source $rootdir/test/common/autotest_common.sh 
source $rootdir/test/iscsi_tgt/common.sh



delete_tmp_files() {

	rm -f $testdir/iscsi.conf

	rm -f ./local-job0-0-verify.state

}
@@ -49,8 +48,6 @@ fi 


timing_enter fio



cp $testdir/iscsi.conf.in $testdir/iscsi.conf



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=4096
@@ -59,13 +56,16 @@ fio_py="$rootdir/scripts/fio.py" 


timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf &

$ISCSI_APP --wait-for-rpc &

pid=$!

echo "Process pid: $pid"



trap "killprocess $pid; rm -f $testdir/iscsi.conf; exit 1" SIGINT SIGTERM EXIT

trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $pid



$rpc_py load_config < $testdir/iscsi.json



echo "iscsi_tgt is listening. Running tests..."



timing_exit start_iscsi_tgt

test/iscsi_tgt/fio/iscsi.conf.in

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
[Global]



[iSCSI]

  NodeBase "iqn.2016-06.io.spdk"

  AuthFile /usr/local/etc/spdk/auth.conf

  Timeout 30

  DiscoveryAuthMethod Auto

  MaxSessions 16

  ImmediateData Yes

  ErrorRecoveryLevel 0



[Nvme]

  RetryCount 4

  ActionOnTimeout None

  AdminPollRate 100000

  HotplugEnable Yes

test/iscsi_tgt/fio/iscsi.json

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{

  "subsystems": [

    {

      "subsystem": "bdev",

      "config": [

        {

          "params": {

            "retry_count": 4,

            "nvme_adminq_poll_period_us": 100000,

            "action_on_timeout": "none"

          },

          "method": "set_bdev_nvme_options"

        }

      ]

    },

    {

      "subsystem": "iscsi",

      "config": [

        {

          "method": "set_iscsi_options",

          "params": {

            "nop_timeout": 30,

            "node_base": "iqn.2016-06.io.spdk",

            "max_sessions": 16,

            "error_recovery_level": 0

          }

        }

      ]

    }

  ]

}