Gargi-jais11 commented on code in PR #12055:
URL: https://github.com/apache/ozone/pull/12055#discussion_r4639864942
##########
hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot:
##########
@@ -34,69 +35,90 @@ Generate prefix
Test ozone shell
[arguments] ${protocol} ${server} ${volume}
- Kinit test user
+ ${result} = Execute Later ozone sh volume create
${protocol}${server}/${volume} --space-quota 100TB --namespace-quota 100
+ Assert Later File Should Be Empty ${result}
+
+ ${result} = Execute Later ozone sh volume list ${protocol}${server}/
+ ${filter} = Set Variable jq -r '.[] | select(.name=="${volume}")'
+ Assert Later File ${result} Filtered By ${filter} Should Contain
creationTime
- ${result} = Execute and checkrc ozone sh volume info
${protocol}${server}/${volume} 255
- Should contain ${result} VOLUME_NOT_FOUND
- ${result} = Execute ozone sh volume create
${protocol}${server}/${volume} --space-quota 100TB --namespace-quota 100
- Should Be Empty ${result}
- ${result} = Execute ozone sh volume list
${protocol}${server}/ | jq -r '.[] | select(.name=="${volume}")'
- Should contain ${result} creationTime
# TODO: Disable updating the owner, acls should be used to give access to
other user.
- Execute ozone sh volume setquota
${protocol}${server}/${volume} --space-quota 10TB --namespace-quota 100
-# ${result} = Execute ozone sh volume info
${protocol}${server}/${volume} | jq -r '. | select(.volumeName=="${volume}") |
.owner | .name'
-# Should Be Equal ${result} bill
- ${result} = Execute ozone sh volume info
${protocol}${server}/${volume} | jq -r '. | select(.name=="${volume}") |
.quotaInBytes'
- Should Be Equal ${result} 10995116277760
- ${result} = Execute ozone sh bucket create
${protocol}${server}/${volume}/bb1 --space-quota 10TB --namespace-quota 100
- Should Be Empty ${result}
- Execute ozone sh bucket info
${protocol}${server}/${volume}/bb1 > ${TMP_JSON}
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.storageType' ${TMP_JSON}
- Should Be Equal ${result} DISK
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInBytes' ${TMP_JSON}
- Should Be Equal ${result} 10995116277760
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInNamespace' ${TMP_JSON}
- Should Be Equal ${result} 100
- Execute ozone sh bucket setquota
${protocol}${server}/${volume}/bb1 --space-quota 1TB --namespace-quota 1000
- Execute ozone sh bucket info
${protocol}${server}/${volume}/bb1 > ${TMP_JSON}
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInBytes' ${TMP_JSON}
- Should Be Equal ${result} 1099511627776
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInNamespace' ${TMP_JSON}
- Should Be Equal ${result} 1000
- ${result} = Execute ozone sh bucket list
${protocol}${server}/${volume}/ | jq -r '.[] | select(.name=="bb1") |
.volumeName'
- Should Be Equal ${result} ${volume}
- Run Keyword Test key handling ${protocol}
${server} ${volume}
- Execute ozone sh volume clrquota --space-quota
${protocol}${server}/${volume}
- ${result} = Execute ozone sh volume info
${protocol}${server}/${volume} | jq -r '. | select(.name=="${volume}") |
.quotaInBytes'
- Should Be Equal ${result} -1
- Execute ozone sh volume clrquota
--namespace-quota ${protocol}${server}/${volume}
- ${result} = Execute ozone sh volume info
${protocol}${server}/${volume} | jq -r '. | select(.name=="${volume}") |
.quotaInNamespace'
- Should Be Equal ${result} -1
- Execute ozone sh bucket clrquota --space-quota
${protocol}${server}/${volume}/bb1
- ${result} = Execute ozone sh bucket info
${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") |
.quotaInBytes'
- Should Be Equal ${result} -1
- Execute ozone sh bucket clrquota
--namespace-quota ${protocol}${server}/${volume}/bb1
- ${result} = Execute ozone sh bucket info
${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") |
.quotaInNamespace'
- Should Be Equal ${result} -1
- Execute ozone sh bucket delete -r --yes
${protocol}${server}/${volume}/bb1
- Execute ozone sh volume delete
${protocol}${server}/${volume}
- Execute ozone sh volume create
${protocol}${server}/${volume}
- Execute ozone sh volume info
${protocol}${server}/${volume} > ${TMP_JSON}
- ${result} = Execute jq -r '. | select(.name=="${volume}")
| .quotaInBytes' ${TMP_JSON}
- Should Be Equal ${result} -1
- ${result} = Execute jq -r '. | select(.name=="${volume}")
| .quotaInNamespace' ${TMP_JSON}
- Should Be Equal ${result} -1
- Execute ozone sh bucket create
${protocol}${server}/${volume}/bb1
- Execute ozone sh bucket info
${protocol}${server}/${volume}/bb1 > ${TMP_JSON}
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInBytes' ${TMP_JSON}
- Should Be Equal ${result} -1
- ${result} = Execute jq -r '. | select(.name=="bb1") |
.quotaInNamespace' ${TMP_JSON}
- Should Be Equal ${result} -1
- Execute ozone sh bucket delete
${protocol}${server}/${volume}/bb1
- Execute ozone sh volume delete
${protocol}${server}/${volume}
+ Execute Later ozone sh volume setquota ${protocol}${server}/${volume}
--space-quota 10TB --namespace-quota 100
+# ${result} = Execute Later ozone sh volume info
${protocol}${server}/${volume}
+# ${filter} = Set Variable jq -r '. |
select(.volumeName=="${volume}") | .owner | .name'
+# Assert Later File ${result} Filtered By ${filter}
Should Be Equal bill
+
+ ${result} = Execute Later ozone sh volume info
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '. | select(.name=="${volume}") |
.quotaInBytes'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
10995116277760
+
+ ${result} = Execute Later ozone sh bucket create
${protocol}${server}/${volume}/bb1 --space-quota 10TB --namespace-quota 100
+ Assert Later File Should Be Empty ${result}
+
+ ${result} = Execute Later ozone sh bucket info
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.storageType'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
DISK
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInBytes'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
10995116277760
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInNamespace'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
100
+
+ Execute Later ozone sh bucket setquota
${protocol}${server}/${volume}/bb1 --space-quota 1TB --namespace-quota 1000
+ ${result} = Execute Later ozone sh bucket info
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInBytes'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
1099511627776
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInNamespace'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
1000
+
+ ${result} = Execute Later ozone sh bucket list
${protocol}${server}/${volume}/
+ ${filter} = Set Variable jq -r '.[] | select(.name=="bb1") |
.volumeName'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
${volume}
+
+ Test key handling ${protocol} ${server} ${volume}
+
+ Execute Later ozone sh volume clrquota --space-quota
${protocol}${server}/${volume}
+ ${result} = Execute Later ozone sh volume info
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '. | select(.name=="${volume}") |
.quotaInBytes'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
-1
+
+ Execute Later ozone sh volume clrquota --namespace-quota
${protocol}${server}/${volume}
+ ${result} = Execute Later ozone sh volume info
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '. | select(.name=="${volume}") |
.quotaInNamespace'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
-1
+
+ Execute Later ozone sh bucket clrquota --space-quota
${protocol}${server}/${volume}/bb1
+ ${result} = Execute Later ozone sh bucket info
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInBytes'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
-1
+
+ Execute Later ozone sh bucket clrquota --namespace-quota
${protocol}${server}/${volume}/bb1
+ ${result} = Execute Later ozone sh bucket info
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '. | select(.name=="bb1") |
.quotaInNamespace'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
-1
+
+ Execute Later ozone sh bucket delete -r --yes
${protocol}${server}/${volume}/bb1
+ Execute Later ozone sh volume delete ${protocol}${server}/${volume}
+ Execute Later ozone sh volume create ${protocol}${server}/${volume}
Review Comment:
Previously **Execute** failed this test case if bucket delete, volume delete
or the second volume create returned `non-zero`.
the new Ozone Batch runs with `--continue-batch-on-error `and ignores the
exit code, and nothing asserts on these outputs. If the delete fails, the
volume and bucket still exist with the quotas already cleared to -1 by
clrquota, so the following **quotaInBytes == -1 / quotaInNamespace == -1**
checks still pass. The part that checks a new volume has default quotas becomes
a no op.
Please assert on these outputs:
- **File Should Be Empty** for the second volume create (as already done for
the first one), and
- for the deletes either check the success message or queue volume info and
assert VOLUME_NOT_FOUND before recreating.
I bileve, the final volume delete at line 116 has the same gap.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]