Repository: incubator-falcon Updated Branches: refs/heads/master 5acc8ad51 -> 6113b70b0
FALCON-871 Merlin clusters should have hadoop.rpc.protection property. 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/6113b70b Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/6113b70b Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/6113b70b Branch: refs/heads/master Commit: 6113b70b0c209ccffa60dd63812552dc48e04b50 Parents: 5acc8ad Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Thu Nov 6 17:14:06 2014 -0800 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Thu Nov 6 17:14:06 2014 -0800 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../org/apache/falcon/regression/core/util/BundleUtil.java | 9 +++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6113b70b/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 96bed6a..b001533 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -137,6 +137,9 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-871 Merlin clusters should have hadoop.rpc.protection property + (Raghav Kumar Gautam) + FALCON-865 Rest end-point entities/summary has changed (Ruslan Ostafiychuk) FALCON-867 In process ACL tests process validity needs to be in future http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6113b70b/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 b9acc3b..20e5839 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,9 @@ package org.apache.falcon.regression.core.util; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.falcon.entity.v0.cluster.Location; +import org.apache.falcon.entity.v0.cluster.Property; import org.apache.falcon.regression.Entities.ClusterMerlin; import org.apache.falcon.regression.Entities.FeedMerlin; import org.apache.falcon.regression.Entities.ProcessMerlin; @@ -118,6 +120,13 @@ public final class BundleUtil { working.setPath(Config.getProperty("merlin.working.location", "/tmp/falcon-regression-working")); clusterMerlin.getLocations().getLocations().add(working); + final String protectionPropName = "hadoop.rpc.protection"; + final String protectionPropValue = Config.getProperty(protectionPropName).trim(); + if (StringUtils.isNotEmpty(protectionPropValue)) { + final Property property = Util.getFalconClusterPropertyObject( + protectionPropName, protectionPropValue); + clusterMerlin.getProperties().getProperties().add(property); + } clusterData = clusterMerlin.toString(); } else if (data.contains("uri:ivory:feed:0.1") ||
