adoroszlai commented on code in PR #9427:
URL: https://github.com/apache/ozone/pull/9427#discussion_r2587986292
##########
hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java:
##########
@@ -61,19 +63,7 @@ public static Codec<OmPrefixInfo> getCodec() {
* @return {@literal List<OzoneAcl>}
*/
public List<OzoneAcl> getAcls() {
- return acls;
- }
-
- public boolean addAcl(OzoneAcl acl) {
- return OzoneAclUtil.addAcl(acls, acl);
- }
-
- public boolean removeAcl(OzoneAcl acl) {
- return OzoneAclUtil.removeAcl(acls, acl);
- }
-
- public boolean setAcls(List<OzoneAcl> newAcls) {
- return OzoneAclUtil.setAcl(acls, newAcls);
+ return ImmutableList.copyOf(acls);
Review Comment:
nit: since `acls` is already `ImmutableList`, we don't need to copy it.
##########
hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java:
##########
@@ -94,13 +95,17 @@ public void testCopyObject() {
assertEquals(omPrefixInfo, clonePrefixInfo);
+ OmPrefixInfo modifiedPrefixInfo = new OmPrefixInfo.Builder(omPrefixInfo)
Review Comment:
nit:
```suggestion
OmPrefixInfo modifiedPrefixInfo = omPrefixInfo.toBuilder()
```
##########
hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java:
##########
@@ -94,13 +95,17 @@ public void testCopyObject() {
assertEquals(omPrefixInfo, clonePrefixInfo);
+ OmPrefixInfo modifiedPrefixInfo = new OmPrefixInfo.Builder(omPrefixInfo)
+ .addAcls(Collections.singletonList(OzoneAcl.of(
+ IAccessAuthorizer.ACLIdentityType.USER, username,
+ ACCESS, IAccessAuthorizer.ACLType.READ)))
+ .build();
- // Change acls and check.
- omPrefixInfo.addAcl(OzoneAcl.of(
- IAccessAuthorizer.ACLIdentityType.USER, username,
- ACCESS, IAccessAuthorizer.ACLType.READ));
-
- assertNotEquals(omPrefixInfo, clonePrefixInfo);
+ assertNotEquals(modifiedPrefixInfo, clonePrefixInfo);
+ assertThrows(UnsupportedOperationException.class,
+ () -> omPrefixInfo.getAcls().add(OzoneAcl.of(
+ IAccessAuthorizer.ACLIdentityType.USER, username,
+ ACCESS, IAccessAuthorizer.ACLType.READ)));
Review Comment:
nit: this belongs to a separate test case, since it verifies immutability
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java:
##########
@@ -270,27 +274,31 @@ public OMPrefixAclOpResult removeAcl(OzoneObj ozoneObj,
OzoneAcl ozoneAcl,
return new OMPrefixAclOpResult(null, false);
}
- boolean removed = prefixInfo.removeAcl(ozoneAcl);
+ List<OzoneAcl> updatedAcls = new ArrayList<>(prefixInfo.getAcls());
Review Comment:
This copies the list of ACLs, then `Builder.setAcls` copies them to its own
list. I'd like to avoid this double copying. Please see #9430 for proposed
improvement, used in `OmVolumeArgs` as POC. If it's accepted, can be applied
to `OmPrefixInfo` and other classes, too.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java:
##########
@@ -235,33 +235,37 @@ public OMPrefixAclOpResult addAcl(OzoneObj ozoneObj,
OzoneAcl ozoneAcl,
// No explicit prefix create API, both add/set Acl can get new prefix
// created. When new prefix is created, it should inherit parent prefix
// or bucket default ACLs.
- boolean newPrefix = false;
- if (prefixInfo == null) {
- OmPrefixInfo.Builder prefixInfoBuilder =
- new OmPrefixInfo.Builder()
- .setName(ozoneObj.getPath());
- if (transactionLogIndex > 0) {
- prefixInfoBuilder.setObjectID(OmUtils.getObjectIdFromTxId(
- metadataManager.getOmEpoch(), transactionLogIndex));
- prefixInfoBuilder.setUpdateID(transactionLogIndex);
- }
- prefixInfo = prefixInfoBuilder.build();
- newPrefix = true;
+ boolean newPrefix = prefixInfo == null;
+ OmPrefixInfo.Builder prefixInfoBuilder = newPrefix
+ ? new OmPrefixInfo.Builder().setName(ozoneObj.getPath())
+ : prefixInfo.toBuilder();
+
+ if (newPrefix && transactionLogIndex > 0) {
+ prefixInfoBuilder.setObjectID(OmUtils.getObjectIdFromTxId(
+ metadataManager.getOmEpoch(), transactionLogIndex));
+ prefixInfoBuilder.setUpdateID(transactionLogIndex);
}
- boolean changed = prefixInfo.addAcl(ozoneAcl);
+ List<OzoneAcl> updatedAcls = new ArrayList<>(
+ prefixInfo == null ? EMPTY_ACL_LIST : prefixInfo.getAcls());
+ boolean changed = OzoneAclUtil.addAcl(updatedAcls, ozoneAcl);
+
// Update the in-memory prefix tree regardless whether the ACL is changed.
// Under OM HA, update ID of the prefix info is updated for every request.
if (newPrefix) {
- inheritParentAcl(ozoneObj, prefixInfo);
+ inheritParentAcl(ozoneObj, updatedAcls);
}
+ OmPrefixInfo updatedPrefixInfo = prefixInfoBuilder
+ .setAcls(updatedAcls)
+ .build();
// update the in-memory prefix tree
- prefixTree.insert(ozoneObj.getPath(), prefixInfo);
+ prefixTree.insert(ozoneObj.getPath(), updatedPrefixInfo);
if (!isRatisEnabled) {
- metadataManager.getPrefixTable().put(ozoneObj.getPath(), prefixInfo);
+ metadataManager.getPrefixTable().put(ozoneObj.getPath(),
+ updatedPrefixInfo);
Review Comment:
nit: no need to wrap (also in `removeAcl` and `setAcl`)
```suggestion
metadataManager.getPrefixTable().put(ozoneObj.getPath(),
updatedPrefixInfo);
```
--
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]
