diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 668d10f66..47f6bb8a0 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -10021,6 +10021,7 @@ dst_bdev_name | Required | string | Name of the bdev that acts as ### bdev_lvol_set_xattr {#rpc_bdev_lvol_set_xattr} Set xattr for lvol bdev + #### Parameters Name | Optional | Type | Description @@ -10032,6 +10033,7 @@ xattr_value | Required | string | Value of the xattr ### bdev_lvol_get_xattr {#rpc_bdev_lvol_get_xattr} Get xattr for lvol bdev + #### Parameters Name | Optional | Type | Description @@ -10039,8 +10041,6 @@ Name | Optional | Type | Description name | Required | string | UUID or alias of lvol xattr_name | Required | string | Name of the xattr - - #### Example Example request: diff --git a/scripts/rpc.py b/scripts/rpc.py index 129a89287..706888509 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -2086,7 +2086,8 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse name=args.name, offset=args.offset, size=args.size)) - p = subparsers.add_parser('bdev_lvol_get_fragmap', help='Get a fragmap for a specific segment of a logical volume using the provided offset and size.') + p = subparsers.add_parser('bdev_lvol_get_fragmap', + help='Get a fragmap for a specific segment of a logical volume using the provided offset and size.') p.add_argument('name', help='lvol bdev name') p.add_argument('--offset', help='offset in bytes of the specific segment of the logical volume', type=int, required=False) p.add_argument('--size', help='size in bytes of the specific segment of the logical volume', type=int, required=False) diff --git a/test/lvol/fragmap.sh b/test/lvol/fragmap.sh index b68c0a2f2..5bf0bcb3e 100755 --- a/test/lvol/fragmap.sh +++ b/test/lvol/fragmap.sh @@ -10,7 +10,7 @@ source $rootdir/test/lvol/common.sh source $rootdir/test/bdev/nbd_common.sh NUM_CLUSTERS=10 -LVS_DEFAULT_CLUSTER_SIZE_BTYE=$((LVS_DEFAULT_CLUSTER_SIZE_MB*1024*1024)) +LVS_DEFAULT_CLUSTER_SIZE_BTYE=$((LVS_DEFAULT_CLUSTER_SIZE_MB * 1024 * 1024)) function verify() { local fragmap="$1" @@ -68,12 +68,12 @@ function test_fragmap_data_hole() { verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "$NUM_CLUSTERS" "1" "AQA=" # Read fragmap [0, 5) clusters - size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset 0 --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "1" "AQ==" # Read fragmap [5, 10) clusters - offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset $offset --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "0" "AA==" @@ -105,12 +105,12 @@ function test_fragmap_hole_data() { verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "$NUM_CLUSTERS" "1" "AAI=" # Read fragmap [0, 5) clusters - size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset 0 --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "0" "AA==" # Read fragmap [5, 10) clusters - offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset $offset --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "1" "EA==" @@ -142,12 +142,12 @@ function test_fragmap_hole_data_hole() { verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "$NUM_CLUSTERS" "2" "YAA=" # Read fragmap [0, 5) clusters - size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset 0 --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "0" "AA==" # Read fragmap [5, 10) clusters - offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset $offset --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "2" "Aw==" @@ -180,12 +180,12 @@ function test_fragmap_data_hole_data() { verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "$NUM_CLUSTERS" "6" "hwM=" # Read fragmap [0, 5) clusters - size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + size=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset 0 --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "3" "Bw==" # Read fragmap [5, 10) clusters - offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE*5)) + offset=$((LVS_DEFAULT_CLUSTER_SIZE_BTYE * 5)) fragmap=$(rpc_cmd bdev_lvol_get_fragmap --offset $offset --size $size $lvol_uuid) verify "$fragmap" "$LVS_DEFAULT_CLUSTER_SIZE_BTYE" "5" "3" "HA==" @@ -198,7 +198,6 @@ function test_fragmap_data_hole_data() { check_leftover_devices } - $SPDK_BIN_DIR/spdk_tgt & spdk_pid=$! trap 'killprocess "$spdk_pid"; exit 1' SIGINT SIGTERM EXIT diff --git a/test/lvol/xattr.sh b/test/lvol/xattr.sh index 9b64cae1c..5e573a961 100755 --- a/test/lvol/xattr.sh +++ b/test/lvol/xattr.sh @@ -15,10 +15,10 @@ function is_rfc3339_formatted() { # Check if the input string matches the pattern if [[ $1 =~ $rfc3339_pattern ]]; then echo "The time string '$1' is in RFC3339 format." - return 0 # Success + return 0 # Success else echo "The time string '$1' is not in RFC3339 format." - return 1 # Failure + return 1 # Failure fi }