You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2014/10/18 01:08:31 UTC
git commit: FALCON-812 all the entities must have acl. Contributed by
Raghav Kumar Gautam
Repository: incubator-falcon
Updated Branches:
refs/heads/master 85ad94050 -> 0db944c87
FALCON-812 all the entities must have acl. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/0db944c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/0db944c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/0db944c8
Branch: refs/heads/master
Commit: 0db944c87ab43de5f08f775f0944e94f7af6455b
Parents: 85ad940
Author: Raghav Kumar Gautam <ra...@apache.org>
Authored: Fri Oct 17 16:08:15 2014 -0700
Committer: Raghav Kumar Gautam <ra...@apache.org>
Committed: Fri Oct 17 16:08:15 2014 -0700
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/core/util/BundleUtil.java | 19 ++++++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0db944c8/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 15554ab..ea64cd5 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -14,6 +14,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-812 all the entities must have acl (Raghav Kumar Gautam)
+
FALCON-801 Increasing time to wait for instance (Paul Isaychuk)
FALCON-809 Add message from response if assertSucceeded fails (Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0db944c8/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
index 3b2f8dd..dfa9992 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
@@ -20,7 +20,11 @@ package org.apache.falcon.regression.core.util;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.falcon.regression.Entities.ClusterMerlin;
+import org.apache.falcon.regression.Entities.FeedMerlin;
+import org.apache.falcon.regression.Entities.ProcessMerlin;
import org.apache.falcon.regression.core.bundle.Bundle;
+import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants;
import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -97,17 +101,26 @@ public final class BundleUtil {
if (data.contains("uri:ivory:cluster:0.1") || data.contains("uri:falcon:cluster:0.1")) {
LOGGER.info("data been added to cluster");
- clusterData = data;
+ ClusterMerlin clusterMerlin = new ClusterMerlin(data);
+ clusterMerlin.setACL(MerlinConstants.CURRENT_USER_NAME,
+ MerlinConstants.CURRENT_USER_GROUP, "*");
+ clusterData = clusterMerlin.toString();
} else if (data.contains("uri:ivory:feed:0.1")
||
data.contains("uri:falcon:feed:0.1")) {
LOGGER.info("data been added to feed");
- dataSets.add(InstanceUtil.setFeedACL(data));
+ FeedMerlin feedMerlin = new FeedMerlin(data);
+ feedMerlin.setACL(MerlinConstants.CURRENT_USER_NAME,
+ MerlinConstants.CURRENT_USER_GROUP, "*");
+ dataSets.add(feedMerlin.toString());
} else if (data.contains("uri:ivory:process:0.1")
||
data.contains("uri:falcon:process:0.1")) {
LOGGER.info("data been added to process");
- processData = data;
+ ProcessMerlin processMerlin = new ProcessMerlin(data);
+ processMerlin.setACL(MerlinConstants.CURRENT_USER_NAME,
+ MerlinConstants.CURRENT_USER_GROUP, "*");
+ processData = processMerlin.toString();
}
}
Assert.assertNotNull(clusterData, "expecting cluster data to be non-empty");