ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev_malloc and bdev_null : remove support for deprecated RPC names

Browse Source 
These were deprecated in 2019, it's time to remove
support for them now.

Change-Id: Ic80ce74344b24814dad792cfff6a4791d0430527
Signed-off-by: wanghailiangx <hailiangx.e.wang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12741
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
wanghailiangx 2022-05-19 03:19:59 -04:00 committed by Tomasz Zawadzki
parent 95c589e6e9
commit c77f17a53e
9 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/bdev/malloc/bdev_malloc_rpc.c
View File

@ -115,7 +115,6 @@ cleanup:
free_rpc_construct_malloc(&req);
}
SPDK_RPC_REGISTER("bdev_malloc_create", rpc_bdev_malloc_create, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_create, construct_malloc_bdev)
struct rpc_delete_malloc {
char *name;
@ -164,4 +163,3 @@ cleanup:
free_rpc_delete_malloc(&req);
}
SPDK_RPC_REGISTER("bdev_malloc_delete", rpc_bdev_malloc_delete, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_delete, delete_malloc_bdev)

2
module/bdev/null/bdev_null_rpc.c
View File

@ -150,7 +150,6 @@ cleanup:
free_rpc_construct_null(&req);
}
SPDK_RPC_REGISTER("bdev_null_create", rpc_bdev_null_create, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_create, construct_null_bdev)
struct rpc_delete_null {
char *name;
@ -202,7 +201,6 @@ cleanup:
free_rpc_delete_null(&req);
}
SPDK_RPC_REGISTER("bdev_null_delete", rpc_bdev_null_delete, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_delete, delete_null_bdev)
struct rpc_bdev_null_resize {
char *name;

4
python/spdk/rpc/bdev.py
View File

@ -242,7 +242,6 @@ def bdev_ocf_set_seqcutoff(client, name, policy, threshold, promotion_count):
return client.call('bdev_ocf_set_seqcutoff', params)
@deprecated_alias('construct_malloc_bdev')
def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None, optimal_io_boundary=None):
"""Construct a malloc block device.
@ -266,7 +265,6 @@ def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None, opt
return client.call('bdev_malloc_create', params)
@deprecated_alias('delete_malloc_bdev')
def bdev_malloc_delete(client, name):
"""Delete malloc block device.
@ -277,7 +275,6 @@ def bdev_malloc_delete(client, name):
return client.call('bdev_malloc_delete', params)
@deprecated_alias('construct_null_bdev')
def bdev_null_create(client, num_blocks, block_size, name, uuid=None, md_size=None,
dif_type=None, dif_is_head_of_md=None):
"""Construct a null block device.
@ -307,7 +304,6 @@ def bdev_null_create(client, num_blocks, block_size, name, uuid=None, md_size=No
return client.call('bdev_null_create', params)
@deprecated_alias('delete_null_bdev')
def bdev_null_delete(client, name):
"""Remove null bdev from the system.

12
scripts/rpc.py
View File

@ -369,8 +369,7 @@ if __name__ == "__main__":
name=args.name,
uuid=args.uuid,
optimal_io_boundary=args.optimal_io_boundary))
p = subparsers.add_parser('bdev_malloc_create', aliases=['construct_malloc_bdev'],
help='Create a bdev with malloc backend')
p = subparsers.add_parser('bdev_malloc_create', help='Create a bdev with malloc backend')
p.add_argument('-b', '--name', help="Name of the bdev")
p.add_argument('-u', '--uuid', help="UUID of the bdev")
p.add_argument(
@ -384,8 +383,7 @@ if __name__ == "__main__":
rpc.bdev.bdev_malloc_delete(args.client,
name=args.name)
p = subparsers.add_parser('bdev_malloc_delete', aliases=['delete_malloc_bdev'],
help='Delete a malloc disk')
p = subparsers.add_parser('bdev_malloc_delete', help='Delete a malloc disk')
p.add_argument('name', help='malloc bdev name')
p.set_defaults(func=bdev_malloc_delete)
@ -403,8 +401,7 @@ if __name__ == "__main__":
dif_type=args.dif_type,
dif_is_head_of_md=args.dif_is_head_of_md))
p = subparsers.add_parser('bdev_null_create', aliases=['construct_null_bdev'],
help='Add a bdev with null backend')
p = subparsers.add_parser('bdev_null_create', help='Add a bdev with null backend')
p.add_argument('name', help='Block device name')
p.add_argument('-u', '--uuid', help='UUID of the bdev')
p.add_argument('total_size', help='Size of null bdev in MB (int > 0). Includes only data blocks.', type=int)
@ -423,8 +420,7 @@ if __name__ == "__main__":
rpc.bdev.bdev_null_delete(args.client,
name=args.name)
p = subparsers.add_parser('bdev_null_delete', aliases=['delete_null_bdev'],
help='Delete a null bdev')
p = subparsers.add_parser('bdev_null_delete', help='Delete a null bdev')
p.add_argument('name', help='null bdev name')
p.set_defaults(func=bdev_null_delete)

2
test/external_code/hello_world/bdev.json
View File

@ -9,7 +9,7 @@
"block_size": 4096,
"num_blocks": 32
},
"method": "construct_malloc_bdev"
"method": "bdev_malloc_create"
}
]
}

2
test/external_code/hello_world/bdev_external.json
View File

@ -9,7 +9,7 @@
"block_size": 4096,
"num_blocks": 32
},
"method": "construct_malloc_bdev"
"method": "bdev_malloc_create"
},
{
"params": {

4
test/json_config/alias_rpc/alias_rpc.sh
View File

@ -13,8 +13,4 @@ waitforlisten $spdk_tgt_pid
# Test deprecated rpcs in json
$rootdir/scripts/rpc.py load_config -i < $testdir/conf.json
# Test deprecated rpcs in rpc.py
$rootdir/scripts/rpc.py delete_malloc_bdev "Malloc0"
$rootdir/scripts/rpc.py delete_malloc_bdev "Malloc1"
killprocess $spdk_tgt_pid

4
test/json_config/alias_rpc/conf.json
View File

@ -20,7 +20,7 @@
"block_size": 4096,
"num_blocks": 32
},
"method": "construct_malloc_bdev"
"method": "bdev_malloc_create"
},
{
"params": {
@ -28,7 +28,7 @@
"block_size": 4096,
"num_blocks": 32
},
"method": "construct_malloc_bdev"
"method": "bdev_malloc_create"
}
]
},

8
test/lvol/basic.sh
View File

@ -71,18 +71,18 @@ function test_construct_two_lvs_on_the_same_bdev() {
# try to create two lvs with conflicting aliases
function test_construct_lvs_conflict_alias() {
# create first bdev and lvs
malloc1_name=$(rpc_cmd construct_malloc_bdev $MALLOC_SIZE_MB $MALLOC_BS)
malloc1_name=$(rpc_cmd bdev_malloc_create $MALLOC_SIZE_MB $MALLOC_BS)
lvs1_uuid=$(rpc_cmd construct_lvol_store "$malloc1_name" lvs_test)
# create second bdev and lvs with the same name as previously
malloc2_name=$(rpc_cmd construct_malloc_bdev $MALLOC_SIZE_MB $MALLOC_BS)
malloc2_name=$(rpc_cmd bdev_malloc_create $MALLOC_SIZE_MB $MALLOC_BS)
rpc_cmd construct_lvol_store "$malloc2_name" lvs_test && false
# clean up
rpc_cmd destroy_lvol_store -u "$lvs1_uuid"
rpc_cmd get_lvol_stores -u "$lvs1_uuid" && false
rpc_cmd delete_malloc_bdev "$malloc1_name"
rpc_cmd delete_malloc_bdev "$malloc2_name"
rpc_cmd bdev_malloc_delete "$malloc1_name"
rpc_cmd bdev_malloc_delete "$malloc2_name"
check_leftover_devices
}