falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject falcon git commit: FALCON-1416 Add ACL (if missing) during touch. Contributed by Narayan Periwal.
Date Fri, 04 Sep 2015 18:26:03 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 5ae9f314e -> 52a79381a


FALCON-1416 Add ACL (if missing) during touch. Contributed by Narayan Periwal.


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/52a79381
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/52a79381
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/52a79381

Branch: refs/heads/master
Commit: 52a79381ae03d1279d416dc956a0fe6301d8d707
Parents: 5ae9f31
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Fri Sep 4 21:06:42 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Fri Sep 4 21:06:42 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 .../java/org/apache/falcon/resource/AbstractEntityManager.java     | 2 +-
 .../apache/falcon/resource/AbstractSchedulableEntityManager.java   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/52a79381/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea11c64..ddd47a2 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,8 @@ Trunk (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1416 Add ACL (if missing) during touch(Narayan Periwal via Ajay Yadava)
+
     FALCON-1413 Filter By throws wrong error in case of wrong argument being passed(Narayan
Periwal via Ajay Yadava)
 
     FALCON-1421 checkColos should be a no-op for embedded mode(Venkat Ranganathan via Ajay
Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/52a79381/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
index 9700baa..03efa20 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -424,7 +424,7 @@ public abstract class AbstractEntityManager {
      *
      * @param entity entity
      */
-    private void decorateEntityWithACL(Entity entity) {
+    protected void decorateEntityWithACL(Entity entity) {
         if (SecurityUtil.isAuthorizationEnabled() || entity.getACL() != null) {
             return; // not necessary to decorate
         }

http://git-wip-us.apache.org/repos/asf/falcon/blob/52a79381/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java
b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java
index 5b415a2..f9405dc 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java
@@ -273,6 +273,7 @@ public abstract class AbstractSchedulableEntityManager extends AbstractInstanceM
         StringBuilder result = new StringBuilder();
         try {
             Entity entity = EntityUtil.getEntity(type, entityName);
+            decorateEntityWithACL(entity);
             Set<String> clusters = EntityUtil.getClustersDefinedInColos(entity);
             for (String cluster : clusters) {
                 result.append(getWorkflowEngine().touch(entity, cluster, skipDryRun));


Mime
View raw message