Updated Branches: refs/heads/master a0e893e15 -> 38e43325e
OOZIE-1646 HBase Table Copy between two HBase servers doesn't work with Kerberos (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/38e43325 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/38e43325 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/38e43325 Branch: refs/heads/master Commit: 38e43325e315971e902ffb48aa300f03c9d16167 Parents: a0e893e Author: Robert Kanter <[email protected]> Authored: Thu Jan 30 10:47:16 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Thu Jan 30 10:47:16 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/oozie/action/hadoop/HbaseCredentials.java | 2 ++ .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 6 ++++-- release-log.txt | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/38e43325/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java index 1036388..818ac8c 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java @@ -60,6 +60,8 @@ public class HbaseCredentials extends Credentials { Configuration hbaseConf = HBaseConfiguration.create(); // copy cred props to hbaseconf and override if values already exists addPropsConf(props, hbaseConf); + // copy cred props to jobconf and override if values already exist + addPropsConf(props, jobConf); // copy conf from hbaseConf to jobConf without overriding the // already existing values of jobConf injectConf(hbaseConf, jobConf); http://git-wip-us.apache.org/repos/asf/oozie/blob/38e43325/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index b9d7cc9..5cd9eb0 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -45,6 +45,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.AccessControlException; +import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobID; @@ -869,8 +870,9 @@ public class JavaActionExecutor extends ActionExecutor { // insert credentials tokens to launcher job conf if needed if (needInjectCredentials()) { for (Token<? extends TokenIdentifier> tk : credentialsConf.getCredentials().getAllTokens()) { - LOG.debug("ADDING TOKEN: " + tk.getKind().toString()); - launcherJobConf.getCredentials().addToken(tk.getKind(), tk); + Text fauxAlias = new Text(tk.getKind() + "_" + tk.getService()); + LOG.debug("ADDING TOKEN: " + fauxAlias); + launcherJobConf.getCredentials().addToken(fauxAlias, tk); } } else { http://git-wip-us.apache.org/repos/asf/oozie/blob/38e43325/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7bf006e..7d45fe0 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1646 HBase Table Copy between two HBase servers doesn't work with Kerberos (rkanter) OOZIE-1609 HA support for share lib. (puru via rkanter) OOZIE-1622 Multiple CoordSubmit for same bundle (shwethags via virag) OOZIE-1644 Default config from config-default.xml is not propagated to actions (mona)
