Commit f9eb3739 authored by Eugene Kobyak's avatar Eugene Kobyak Committed by Tomasz Zawadzki
Browse files

python/rpc: remove deprecated retry_count param 



Remove deprecated retry_count parameter from
bdev_nvme_set_options rpc function

Change-Id: I1b415cfcfd7b3226d6331960ad42c500ba77f0aa
Signed-off-by: default avatarEugene Kobyak <eugene.kobyak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23498


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
parent 6a1b41d8

doc/jsonrpc.md

+0 −1
Original line number Diff line number Diff line
@@ -3906,7 +3906,6 @@ action_on_timeout | Optional | string | Action to take on command 
timeout_us                 | Optional | number      | Timeout for each command, in microseconds. If 0, don't track timeouts

timeout_admin_us           | Optional | number      | Timeout for each admin command, in microseconds. If 0, treat same as io timeouts ('timeout_us')

keep_alive_timeout_ms      | Optional | number      | Keep alive timeout period in milliseconds, default is 10s

retry_count                | Optional | number      | The number of attempts per I/O before an I/O fails. (Deprecated. Please use transport_retry_count instead.)

arbitration_burst          | Optional | number      | The value is expressed as a power of two, a value of 111b indicates no limit

low_priority_weight        | Optional | number      | The maximum number of commands that the controller may launch at one time from a low priority queue

medium_priority_weight     | Optional | number      | The maximum number of commands that the controller may launch at one time from a medium priority queue

module/bdev/nvme/bdev_nvme_rpc.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_options_decoders[] = 
	{"timeout_us", offsetof(struct spdk_bdev_nvme_opts, timeout_us), spdk_json_decode_uint64, true},

	{"timeout_admin_us", offsetof(struct spdk_bdev_nvme_opts, timeout_admin_us), spdk_json_decode_uint64, true},

	{"keep_alive_timeout_ms", offsetof(struct spdk_bdev_nvme_opts, keep_alive_timeout_ms), spdk_json_decode_uint32, true},

	{"retry_count", offsetof(struct spdk_bdev_nvme_opts, transport_retry_count), spdk_json_decode_uint32, true},

	{"arbitration_burst", offsetof(struct spdk_bdev_nvme_opts, arbitration_burst), spdk_json_decode_uint32, true},

	{"low_priority_weight", offsetof(struct spdk_bdev_nvme_opts, low_priority_weight), spdk_json_decode_uint32, true},

	{"medium_priority_weight", offsetof(struct spdk_bdev_nvme_opts, medium_priority_weight), spdk_json_decode_uint32, true},

python/spdk/rpc/bdev.py

+1 −6
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ def bdev_xnvme_delete(client, name): 




def bdev_nvme_set_options(client, action_on_timeout=None, timeout_us=None, timeout_admin_us=None,

                          keep_alive_timeout_ms=None, retry_count=None, arbitration_burst=None,

                          keep_alive_timeout_ms=None, arbitration_burst=None,

                          low_priority_weight=None, medium_priority_weight=None, high_priority_weight=None,

                          nvme_adminq_poll_period_us=None, nvme_ioq_poll_period_us=None, io_queue_requests=None,

                          delay_cmd_submit=None, transport_retry_count=None, bdev_retry_count=None,
@@ -625,7 +625,6 @@ def bdev_nvme_set_options(client, action_on_timeout=None, timeout_us=None, timeo 
        timeout_us: Timeout for each command, in microseconds. If 0, don't track timeouts (optional)

        timeout_admin_us: Timeout for each admin command, in microseconds. If 0, treat same as io timeouts (optional)

        keep_alive_timeout_ms: Keep alive timeout period in millisecond, default is 10s (optional)

        retry_count: The number of attempts per I/O when an I/O fails (deprecated) (optional)

        arbitration_burst: The value is expressed as a power of two (optional)

        low_priority_weight: The number of commands that may be executed from the low priority queue at one time (optional)

        medium_priority_weight: The number of commands that may be executed from the medium priority queue at one time (optional)
@@ -684,10 +683,6 @@ def bdev_nvme_set_options(client, action_on_timeout=None, timeout_us=None, timeo 
    if keep_alive_timeout_ms is not None:

        params['keep_alive_timeout_ms'] = keep_alive_timeout_ms



    if retry_count is not None:

        print("WARNING: retry_count is deprecated, please use transport_retry_count.")

        params['retry_count'] = retry_count



    if arbitration_burst is not None:

        params['arbitration_burst'] = arbitration_burst

scripts/rpc.py

+0 −3
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ if __name__ == "__main__": 
                                       timeout_us=args.timeout_us,

                                       timeout_admin_us=args.timeout_admin_us,

                                       keep_alive_timeout_ms=args.keep_alive_timeout_ms,

                                       retry_count=args.retry_count,

                                       arbitration_burst=args.arbitration_burst,

                                       low_priority_weight=args.low_priority_weight,

                                       medium_priority_weight=args.medium_priority_weight,
@@ -599,8 +598,6 @@ if __name__ == "__main__": 
                   help="Timeout for each admin command, in microseconds. If 0, treat same as io timeouts.", type=int)

    p.add_argument('-k', '--keep-alive-timeout-ms',

                   help="Keep alive timeout period in millisecond. If 0, disable keep-alive.", type=int)

    p.add_argument('-n', '--retry-count',

                   help='the number of attempts per I/O when an I/O fails. (deprecated, please use --transport-retry-count.)', type=int)

    p.add_argument('--arbitration-burst',

                   help='the value is expressed as a power of two', type=int)

    p.add_argument('--low-priority-weight',

test/fuzz/llvm/nvmf/fuzz_json.conf

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
            "timeout_us": 0,

            "timeout_admin_us": 0,

            "keep_alive_timeout_ms": 10000,

            "retry_count": 4,

            "transport_retry_count": 4,

            "arbitration_burst": 0,

            "low_priority_weight": 0,

            "medium_priority_weight": 0,