falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject incubator-falcon git commit: FALCON-873 BeforeClass fails in falcon-regression if hadoop.rpc.protection is not set contributed by Samarthg
Date Fri, 07 Nov 2014 10:12:16 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master dbdb70751 -> 063d64204


FALCON-873 BeforeClass fails in falcon-regression if hadoop.rpc.protection is not set contributed
by Samarthg


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

Branch: refs/heads/master
Commit: 063d64204278ac128e3413897819124aef510997
Parents: dbdb707
Author: samarthg <samarthgupta437@gmail.com>
Authored: Fri Nov 7 10:11:56 2014 +0000
Committer: samarthg <samarthgupta437@gmail.com>
Committed: Fri Nov 7 10:11:56 2014 +0000

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                    | 4 ++++
 .../java/org/apache/falcon/regression/core/util/BundleUtil.java  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/063d6420/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index b001533..b4765aa 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -137,6 +137,10 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+
+   FALCON-873 BeforeClass fails in falcon-regression if "hadoop.rpc.protection"
+    is not set(Samarth Gupta)
+
    FALCON-871 Merlin clusters should have hadoop.rpc.protection property
    (Raghav Kumar Gautam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/063d6420/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 20e5839..123f2de 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
@@ -121,10 +121,10 @@ public final class BundleUtil {
                         "/tmp/falcon-regression-working"));
                 clusterMerlin.getLocations().getLocations().add(working);
                 final String protectionPropName = "hadoop.rpc.protection";
-                final String protectionPropValue = Config.getProperty(protectionPropName).trim();
+                final String protectionPropValue = Config.getProperty(protectionPropName);
                 if (StringUtils.isNotEmpty(protectionPropValue)) {
                     final Property property = Util.getFalconClusterPropertyObject(
-                            protectionPropName, protectionPropValue);
+                            protectionPropName, protectionPropValue.trim());
                     clusterMerlin.getProperties().getProperties().add(property);
                 }
                 clusterData = clusterMerlin.toString();


Mime
View raw message