From d8d29ec0b1a116941bdead09bedd58f456317566 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Tue, 10 May 2022 03:20:29 -0400 Subject: [PATCH] log: remove support for deprecated RPC names These were deprecated in 2019, it's time to remove support for them now. Change-Id: I32dd9960bc397244d8e3d0a384fc8b67e907bf68 Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12601 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- lib/event/log_rpc.c | 7 ------- python/spdk/rpc/log.py | 7 ------- scripts/rpc.py | 18 +++++++----------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/lib/event/log_rpc.c b/lib/event/log_rpc.c index a56952e99..c93f24d42 100644 --- a/lib/event/log_rpc.c +++ b/lib/event/log_rpc.c @@ -128,7 +128,6 @@ end: } SPDK_RPC_REGISTER("log_set_print_level", rpc_log_set_print_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_print_level, set_log_print_level) static void rpc_log_get_print_level(struct spdk_jsonrpc_request *request, @@ -159,7 +158,6 @@ rpc_log_get_print_level(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("log_get_print_level", rpc_log_get_print_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_print_level, get_log_print_level) static void rpc_log_set_level(struct spdk_jsonrpc_request *request, @@ -191,7 +189,6 @@ end: free_rpc_log_level(&req); } SPDK_RPC_REGISTER("log_set_level", rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level) static void rpc_log_get_level(struct spdk_jsonrpc_request *request, @@ -221,7 +218,6 @@ rpc_log_get_level(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("log_get_level", rpc_log_get_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_level, get_log_level) static void rpc_log_set_flag(struct spdk_jsonrpc_request *request, @@ -250,7 +246,6 @@ end: free_rpc_log_flag(&req); } SPDK_RPC_REGISTER("log_set_flag", rpc_log_set_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_flag, set_log_flag) static void rpc_log_clear_flag(struct spdk_jsonrpc_request *request, @@ -280,7 +275,6 @@ end: } SPDK_RPC_REGISTER("log_clear_flag", rpc_log_clear_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_clear_flag, clear_log_flag) static void rpc_log_get_flags(struct spdk_jsonrpc_request *request, @@ -307,7 +301,6 @@ rpc_log_get_flags(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("log_get_flags", rpc_log_get_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_flags, get_log_flags) struct rpc_log_enable_timestamps { bool enabled; diff --git a/python/spdk/rpc/log.py b/python/spdk/rpc/log.py index ee40bf833..22f173da1 100644 --- a/python/spdk/rpc/log.py +++ b/python/spdk/rpc/log.py @@ -1,7 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('set_log_flag') def log_set_flag(client, flag): """Set log flag. @@ -12,7 +11,6 @@ def log_set_flag(client, flag): return client.call('log_set_flag', params) -@deprecated_alias('clear_log_flag') def log_clear_flag(client, flag): """Clear log flag. @@ -23,7 +21,6 @@ def log_clear_flag(client, flag): return client.call('log_clear_flag', params) -@deprecated_alias('get_log_flags') def log_get_flags(client): """Get log flags @@ -33,7 +30,6 @@ def log_get_flags(client): return client.call('log_get_flags') -@deprecated_alias('set_log_level') def log_set_level(client, level): """Set log level. @@ -44,7 +40,6 @@ def log_set_level(client, level): return client.call('log_set_level', params) -@deprecated_alias('get_log_level') def log_get_level(client): """Get log level @@ -54,7 +49,6 @@ def log_get_level(client): return client.call('log_get_level') -@deprecated_alias('set_log_print_level') def log_set_print_level(client, level): """Set log print level. @@ -65,7 +59,6 @@ def log_set_print_level(client, level): return client.call('log_set_print_level', params) -@deprecated_alias('get_log_print_level') def log_get_print_level(client): """Get log print level diff --git a/scripts/rpc.py b/scripts/rpc.py index 4d26562d2..3498c9c41 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1741,7 +1741,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def log_set_flag(args): rpc.log.log_set_flag(args.client, flag=args.flag) - p = subparsers.add_parser('log_set_flag', help='set log flag', aliases=['set_log_flag']) + p = subparsers.add_parser('log_set_flag', help='set log flag') p.add_argument( 'flag', help='log flag we want to set. (for example "nvme").') p.set_defaults(func=log_set_flag) @@ -1749,7 +1749,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def log_clear_flag(args): rpc.log.log_clear_flag(args.client, flag=args.flag) - p = subparsers.add_parser('log_clear_flag', help='clear log flag', aliases=['clear_log_flag']) + p = subparsers.add_parser('log_clear_flag', help='clear log flag') p.add_argument( 'flag', help='log flag we want to clear. (for example "nvme").') p.set_defaults(func=log_clear_flag) @@ -1757,37 +1757,33 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def log_get_flags(args): print_dict(rpc.log.log_get_flags(args.client)) - p = subparsers.add_parser('log_get_flags', help='get log flags', aliases=['get_log_flags']) + p = subparsers.add_parser('log_get_flags', help='get log flags') p.set_defaults(func=log_get_flags) def log_set_level(args): rpc.log.log_set_level(args.client, level=args.level) - p = subparsers.add_parser('log_set_level', aliases=['set_log_level'], - help='set log level') + p = subparsers.add_parser('log_set_level', help='set log level') p.add_argument('level', help='log level we want to set. (for example "DEBUG").') p.set_defaults(func=log_set_level) def log_get_level(args): print_dict(rpc.log.log_get_level(args.client)) - p = subparsers.add_parser('log_get_level', aliases=['get_log_level'], - help='get log level') + p = subparsers.add_parser('log_get_level', help='get log level') p.set_defaults(func=log_get_level) def log_set_print_level(args): rpc.log.log_set_print_level(args.client, level=args.level) - p = subparsers.add_parser('log_set_print_level', aliases=['set_log_print_level'], - help='set log print level') + p = subparsers.add_parser('log_set_print_level', help='set log print level') p.add_argument('level', help='log print level we want to set. (for example "DEBUG").') p.set_defaults(func=log_set_print_level) def log_get_print_level(args): print_dict(rpc.log.log_get_print_level(args.client)) - p = subparsers.add_parser('log_get_print_level', aliases=['get_log_print_level'], - help='get log print level') + p = subparsers.add_parser('log_get_print_level', help='get log print level') p.set_defaults(func=log_get_print_level) # lvol