From 000ee408e7b98f542766011bff0b51bdd7a378a2 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Mon, 23 May 2022 04:35:59 -0400 Subject: [PATCH] app module: remove support for deprecated RPC names These were deprecated in 2019, it's time to remove support for them now. Change-Id: Ia09368e426a83274d9c7fc90ed8b0391f4d0b67c Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12774 Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- lib/event/app_rpc.c | 2 -- python/spdk/rpc/app.py | 2 -- scripts/rpc.py | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/event/app_rpc.c b/lib/event/app_rpc.c index c30df7a02..d9256c5aa 100644 --- a/lib/event/app_rpc.c +++ b/lib/event/app_rpc.c @@ -111,7 +111,6 @@ invalid: free_rpc_spdk_kill_instance(&req); } SPDK_RPC_REGISTER("spdk_kill_instance", rpc_spdk_kill_instance, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(spdk_kill_instance, kill_instance) struct rpc_framework_monitor_context_switch { @@ -152,7 +151,6 @@ rpc_framework_monitor_context_switch(struct spdk_jsonrpc_request *request, SPDK_RPC_REGISTER("framework_monitor_context_switch", rpc_framework_monitor_context_switch, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_monitor_context_switch, context_switch_monitor) struct rpc_get_stats_ctx { struct spdk_jsonrpc_request *request; diff --git a/python/spdk/rpc/app.py b/python/spdk/rpc/app.py index 9efac27d2..13f9d0b9b 100644 --- a/python/spdk/rpc/app.py +++ b/python/spdk/rpc/app.py @@ -1,7 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('kill_instance') def spdk_kill_instance(client, sig_name): """Send a signal to the SPDK process. @@ -12,7 +11,6 @@ def spdk_kill_instance(client, sig_name): return client.call('spdk_kill_instance', params) -@deprecated_alias('context_switch_monitor') def framework_monitor_context_switch(client, enabled=None): """Query or set state of context switch monitoring. diff --git a/scripts/rpc.py b/scripts/rpc.py index 9d8c5699c..c627ed159 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -133,8 +133,7 @@ if __name__ == "__main__": rpc.app.spdk_kill_instance(args.client, sig_name=args.sig_name) - p = subparsers.add_parser('spdk_kill_instance', aliases=['kill_instance'], - help='Send signal to instance') + p = subparsers.add_parser('spdk_kill_instance', help='Send signal to instance') p.add_argument('sig_name', help='signal will be sent to server.') p.set_defaults(func=spdk_kill_instance) @@ -147,7 +146,7 @@ if __name__ == "__main__": print_dict(rpc.app.framework_monitor_context_switch(args.client, enabled=enabled)) - p = subparsers.add_parser('framework_monitor_context_switch', aliases=['context_switch_monitor'], + p = subparsers.add_parser('framework_monitor_context_switch', help='Control whether the context switch monitor is enabled') p.add_argument('-e', '--enable', action='store_true', help='Enable context switch monitoring') p.add_argument('-d', '--disable', action='store_true', help='Disable context switch monitoring')