You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2019/06/08 04:47:20 UTC
[hadoop] branch trunk updated: HDDS-1657. Fix parallelStream usage
in volume and key native acl. Contributed by Ajay Kumar. (#926)
This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9deac3b HDDS-1657. Fix parallelStream usage in volume and key native acl. Contributed by Ajay Kumar. (#926)
9deac3b is described below
commit 9deac3b6bf46ff8875cdf2dfa6f7064f9379bccd
Author: Ajay Yadav <78...@users.noreply.github.com>
AuthorDate: Fri Jun 7 21:47:14 2019 -0700
HDDS-1657. Fix parallelStream usage in volume and key native acl. Contributed by Ajay Kumar. (#926)
---
.../om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java | 2 +-
.../hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java | 8 ++++++--
.../hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java | 3 +--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index c93ed3c..149f558 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -1377,7 +1377,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
SetAclRequest.Builder builder = SetAclRequest.newBuilder()
.setObj(OzoneObj.toProtobuf(obj));
- acls.parallelStream().forEach(a -> builder.addAcl(OzoneAcl.toProtobuf(a)));
+ acls.forEach(a -> builder.addAcl(OzoneAcl.toProtobuf(a)));
OMRequest omRequest = createOMRequest(Type.SetAcl)
.setSetAclRequest(builder.build())
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index 2a03107..b0f7888 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -2291,9 +2291,13 @@ public abstract class TestOzoneRpcClientAbstract {
expectedAcls.forEach(a -> assertTrue(finalNewAcls.contains(a)));
// Reset acl's.
- store.setAcl(ozObj, new ArrayList<>());
+ OzoneAcl ua = new OzoneAcl(ACLIdentityType.USER, "userx", ACLType.READ_ACL);
+ OzoneAcl ug = new OzoneAcl(ACLIdentityType.GROUP, "userx", ACLType.ALL);
+ store.setAcl(ozObj, Arrays.asList(ua, ug));
newAcls = store.getAcl(ozObj);
- assertTrue(newAcls.size() == 0);
+ assertTrue(newAcls.size() == 2);
+ assertTrue(newAcls.contains(ua));
+ assertTrue(newAcls.contains(ug));
}
private void writeKey(String key1, OzoneBucket bucket) throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
index 568262f..6ea1a2b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
@@ -411,8 +411,7 @@ public class OzoneManagerRequestHandler implements RequestHandler {
private SetAclResponse setAcl(SetAclRequest req) throws IOException {
List<OzoneAcl> ozoneAcl = new ArrayList<>();
- req.getAclList().parallelStream().forEach(a ->
- ozoneAcl.add(OzoneAcl.fromProtobuf(a)));
+ req.getAclList().forEach(a -> ozoneAcl.add(OzoneAcl.fromProtobuf(a)));
boolean response = impl.setAcl(OzoneObjInfo.fromProtobuf(req.getObj()),
ozoneAcl);
return SetAclResponse.newBuilder().setResponse(response).build();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org