BIGTOP-2788: Corrects Apex patch for version 3.6.0 Signed-off-by: Evans Ye <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f25f6d33 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f25f6d33 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f25f6d33 Branch: refs/heads/branch-1.2 Commit: f25f6d332ffc843050cc327362ef3f7b109dae96 Parents: 4404cfb Author: Arnaud Launay <[email protected]> Authored: Mon May 29 15:34:31 2017 +0200 Committer: Evans Ye <[email protected]> Committed: Sat Jul 1 12:52:55 2017 +0000 ---------------------------------------------------------------------- .../src/common/apex/patch1-for-hadoop27x.diff | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f25f6d33/bigtop-packages/src/common/apex/patch1-for-hadoop27x.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/apex/patch1-for-hadoop27x.diff b/bigtop-packages/src/common/apex/patch1-for-hadoop27x.diff index 2cd6be7..3ff850a 100644 --- a/bigtop-packages/src/common/apex/patch1-for-hadoop27x.diff +++ b/bigtop-packages/src/common/apex/patch1-for-hadoop27x.diff @@ -1,7 +1,7 @@ -diff -Naur orig/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java new/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java ---- orig/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java 2016-11-22 02:49:11.000000000 +0530 -+++ new/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java 2017-03-23 23:08:32.692947303 +0530 -@@ -583,7 +583,7 @@ +diff -uraN apache-apex-core-3.6.0-orig/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java apache-apex-core-3.6.0/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java +--- apache-apex-core-3.6.0-orig/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java 2017-04-28 20:55:41.000000000 +0200 ++++ apache-apex-core-3.6.0/engine/src/main/java/com/datatorrent/stram/client/StramAppLauncher.java 2017-05-27 23:44:35.028907503 +0200 +@@ -584,7 +584,7 @@ if (UserGroupInformation.isSecurityEnabled()) { long hdfsTokenMaxLifeTime = conf.getLong(StramClientUtils.DT_HDFS_TOKEN_MAX_LIFE_TIME, conf.getLong(StramClientUtils.HDFS_TOKEN_MAX_LIFE_TIME, StramClientUtils.DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT)); dag.setAttribute(LogicalPlan.HDFS_TOKEN_LIFE_TIME, hdfsTokenMaxLifeTime); @@ -10,15 +10,15 @@ diff -Naur orig/engine/src/main/java/com/datatorrent/stram/client/StramAppLaunch dag.setAttribute(LogicalPlan.RM_TOKEN_LIFE_TIME, rmTokenMaxLifeTime); setTokenRefreshCredentials(dag, conf); } -diff -Naur orig/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java new/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java ---- orig/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java 2016-11-22 02:48:16.000000000 +0530 -+++ new/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java 2017-03-23 23:07:18.948865455 +0530 -@@ -156,7 +156,7 @@ +diff -uraN apache-apex-core-3.6.0-orig/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java apache-apex-core-3.6.0/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java +--- apache-apex-core-3.6.0-orig/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java 2017-04-28 20:55:41.000000000 +0200 ++++ apache-apex-core-3.6.0/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java 2017-05-27 23:44:20.360926755 +0200 +@@ -162,7 +162,7 @@ */ public static Attribute<Boolean> FAST_PUBLISHER_SUBSCRIBER = new Attribute<>(false); public static Attribute<Long> HDFS_TOKEN_LIFE_TIME = new Attribute<>(604800000L); - public static Attribute<Long> RM_TOKEN_LIFE_TIME = new Attribute<>(YarnConfiguration.DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT); + public static Attribute<Long> RM_TOKEN_LIFE_TIME = new Attribute<>(YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT); - public static Attribute<String> PRINCIPAL = new Attribute<String>(null, new StringCodec.String2String()); - public static Attribute<String> KEY_TAB_FILE = new Attribute<>((String)null, new StringCodec.String2String()); + public static Attribute<String> PRINCIPAL = new Attribute<>(null, StringCodec.String2String.getInstance()); + public static Attribute<String> KEY_TAB_FILE = new Attribute<>((String)null, StringCodec.String2String.getInstance()); public static Attribute<Double> TOKEN_REFRESH_ANTICIPATORY_FACTOR = new Attribute<>(0.7);
