This is an automated email from the ASF dual-hosted git repository.
asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new a6386a1 OOZIE-3535 mapreduce.job.acl-view-job property in Oozie
workflow.xml not taking full effect (kmarton via asalamon74)
a6386a1 is described below
commit a6386a17783f94da1816746a58d78207cbc315ed
Author: Andras Salamon <[email protected]>
AuthorDate: Fri Aug 9 16:14:51 2019 +0200
OOZIE-3535 mapreduce.job.acl-view-job property in Oozie workflow.xml not
taking full effect (kmarton via asalamon74)
---
.../apache/oozie/action/hadoop/YarnACLHandler.java | 37 ++++++++++------------
.../oozie/action/hadoop/TestYarnACLHandler.java | 6 ++--
release-log.txt | 1 +
3 files changed, 21 insertions(+), 23 deletions(-)
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/YarnACLHandler.java
b/core/src/main/java/org/apache/oozie/action/hadoop/YarnACLHandler.java
index 46e621f..311099e 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/YarnACLHandler.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/YarnACLHandler.java
@@ -36,27 +36,22 @@ class YarnACLHandler {
}
public void setACLs(ContainerLaunchContext containerLaunchContext) {
- boolean mrAclsEnabled =
launcherConf.getBoolean(MRConfig.MR_ACLS_ENABLED, true);
-
- // This is checked for backward compatibility
- if (mrAclsEnabled) {
- Map<ApplicationAccessType, String> aclDefinition = new HashMap<>();
-
- String viewAcl =
launcherConf.get(JavaActionExecutor.LAUNCER_VIEW_ACL);
- if (viewAcl != null) {
- aclDefinition.put(ApplicationAccessType.VIEW_APP, viewAcl);
- }
-
- String modifyAcl =
launcherConf.get(JavaActionExecutor.LAUNCER_MODIFY_ACL);
- if (modifyAcl != null) {
- aclDefinition.put(ApplicationAccessType.MODIFY_APP, modifyAcl);
- }
-
- if (!aclDefinition.isEmpty()) {
- containerLaunchContext.setApplicationACLs(aclDefinition);
- }
- } else {
- LOG.info("Not setting ACLs because {0} is set to false",
MRConfig.MR_ACLS_ENABLED);
+ Map<ApplicationAccessType, String> aclDefinition = new HashMap<>();
+
+ String viewAcl = launcherConf.get(JavaActionExecutor.LAUNCER_VIEW_ACL);
+ if (viewAcl != null) {
+ LOG.info("Setting view-acl: [{0}]", viewAcl);
+ aclDefinition.put(ApplicationAccessType.VIEW_APP, viewAcl);
+ }
+
+ String modifyAcl =
launcherConf.get(JavaActionExecutor.LAUNCER_MODIFY_ACL);
+ if (modifyAcl != null) {
+ LOG.info("Setting modify-acl: [{0}]", modifyAcl);
+ aclDefinition.put(ApplicationAccessType.MODIFY_APP, modifyAcl);
+ }
+
+ if (!aclDefinition.isEmpty()) {
+ containerLaunchContext.setApplicationACLs(aclDefinition);
}
}
}
diff --git
a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
index a7ef4ad..13ae35e 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
@@ -19,6 +19,7 @@
package org.apache.oozie.action.hadoop;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -87,7 +88,8 @@ public class TestYarnACLHandler {
yarnACLSetter.setACLs(contextMock);
- assertNoACLset();
+ assertViewACLset();
+ assertModifyACLset();
}
private void setupYarnACLHandler(boolean mrACLsEnabled) {
@@ -121,7 +123,7 @@ public class TestYarnACLHandler {
private void verifyACLset(String aclMessage, String aclValue,
ApplicationAccessType aclType) {
verify(contextMock).setApplicationACLs(captor.capture());
Map<ApplicationAccessType, String> aclDefinition = captor.getValue();
- assertEquals("ACL size", 1, aclDefinition.size());
+ assertNotNull(aclDefinition.get(aclType));
assertEquals(aclMessage, aclValue, aclDefinition.get(aclType));
}
}
\ No newline at end of file
diff --git a/release-log.txt b/release-log.txt
index 2a52cf4..50ef876 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3535 mapreduce.job.acl-view-job property in Oozie workflow.xml not
taking full effect (kmarton via asalamon74)
OOZIE-3496 Upgrade ActiveMQ to 5.15.9 (asalamon74 via kmarton)
OOZIE-3504 [Java 11] Fix tests using PowerMock (kmarton via asalamon74)
OOZIE-3528 Migrate to PowerMock 2 and Mockito2 (kmarton via asalamon74)
