From f552937ef4cc93c553208051c08e752ad760b968 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Mon, 23 May 2022 05:35:37 -0400 Subject: [PATCH] trace module: remove support for deprecated RPC names These were deprecated in 2019, it's time to remove support for them now. Change-Id: Ie50c7421f991ad0474edba0e0f339180f7afee00 Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12778 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Konrad Sztyber Reviewed-by: Aleksey Marchuk --- lib/trace/trace_rpc.c | 3 --- python/spdk/rpc/trace.py | 3 --- scripts/rpc.py | 7 +++---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/trace/trace_rpc.c b/lib/trace/trace_rpc.c index 693ff1cd2..4e2b9f32f 100644 --- a/lib/trace/trace_rpc.c +++ b/lib/trace/trace_rpc.c @@ -162,7 +162,6 @@ invalid: } SPDK_RPC_REGISTER("trace_enable_tpoint_group", rpc_trace_enable_tpoint_group, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(trace_enable_tpoint_group, enable_tpoint_group) static void rpc_trace_disable_tpoint_group(struct spdk_jsonrpc_request *request, @@ -196,7 +195,6 @@ invalid: } SPDK_RPC_REGISTER("trace_disable_tpoint_group", rpc_trace_disable_tpoint_group, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(trace_disable_tpoint_group, disable_tpoint_group) static void rpc_trace_get_tpoint_group_mask(struct spdk_jsonrpc_request *request, @@ -241,4 +239,3 @@ rpc_trace_get_tpoint_group_mask(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("trace_get_tpoint_group_mask", rpc_trace_get_tpoint_group_mask, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(trace_get_tpoint_group_mask, get_tpoint_group_mask) diff --git a/python/spdk/rpc/trace.py b/python/spdk/rpc/trace.py index 1b1ea18a5..075548b24 100644 --- a/python/spdk/rpc/trace.py +++ b/python/spdk/rpc/trace.py @@ -1,7 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('enable_tpoint_group') def trace_enable_tpoint_group(client, name): """Enable trace on a specific tpoint group. @@ -12,7 +11,6 @@ def trace_enable_tpoint_group(client, name): return client.call('trace_enable_tpoint_group', params) -@deprecated_alias('disable_tpoint_group') def trace_disable_tpoint_group(client, name): """Disable trace on a specific tpoint group. @@ -47,7 +45,6 @@ def trace_clear_tpoint_mask(client, name, tpoint_mask): return client.call('trace_clear_tpoint_mask', params) -@deprecated_alias('get_tpoint_group_mask') def trace_get_tpoint_group_mask(client): """Get trace point group mask diff --git a/scripts/rpc.py b/scripts/rpc.py index c627ed159..8f8ddb3c3 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1665,7 +1665,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def trace_enable_tpoint_group(args): rpc.trace.trace_enable_tpoint_group(args.client, name=args.name) - p = subparsers.add_parser('trace_enable_tpoint_group', aliases=['enable_tpoint_group'], + p = subparsers.add_parser('trace_enable_tpoint_group', help='enable trace on a specific tpoint group') p.add_argument( 'name', help="""trace group name we want to enable in tpoint_group_mask. @@ -1675,7 +1675,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def trace_disable_tpoint_group(args): rpc.trace.trace_disable_tpoint_group(args.client, name=args.name) - p = subparsers.add_parser('trace_disable_tpoint_group', aliases=['disable_tpoint_group'], + p = subparsers.add_parser('trace_disable_tpoint_group', help='disable trace on a specific tpoint group') p.add_argument( 'name', help="""trace group name we want to disable in tpoint_group_mask. @@ -1713,8 +1713,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def trace_get_tpoint_group_mask(args): print_dict(rpc.trace.trace_get_tpoint_group_mask(args.client)) - p = subparsers.add_parser('trace_get_tpoint_group_mask', aliases=['get_tpoint_group_mask'], - help='get trace point group mask') + p = subparsers.add_parser('trace_get_tpoint_group_mask', help='get trace point group mask') p.set_defaults(func=trace_get_tpoint_group_mask) # log