Repository: oozie Updated Branches: refs/heads/master 1f103db6c -> 9d406cee7
OOZIE-3334 Don't use org.apache.hadoop.hbase.security.User in HDFSCredentials (gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9d406cee Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9d406cee Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9d406cee Branch: refs/heads/master Commit: 9d406cee71c7747a9a759a4ebf463d0a16821b1c Parents: 1f103db Author: Gezapeti Cseh <gezap...@apache.org> Authored: Fri Aug 31 11:47:16 2018 +0200 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Fri Aug 31 11:47:16 2018 +0200 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/HDFSCredentials.java | 9 +++------ release-log.txt | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9d406cee/core/src/main/java/org/apache/oozie/action/hadoop/HDFSCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HDFSCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HDFSCredentials.java index 6c85662..29e254b 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HDFSCredentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HDFSCredentials.java @@ -21,7 +21,6 @@ package org.apache.oozie.action.hadoop; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.security.TokenCache; import org.apache.hadoop.security.Credentials; @@ -63,9 +62,7 @@ public class HDFSCredentials implements CredentialsProvider { final UserGroupInformation ugi = Services.get().get(UserGroupInformationService.class) .getProxyUser(context.getWorkflow().getUser()); - final User user = User.create(ugi); - - obtainTokensForNamenodes(credentials, config, user, paths); + obtainTokensForNamenodes(credentials, config, ugi, paths); } else { obtainTokenForAppFileSystemNameNode(credentials, config, context); @@ -95,11 +92,11 @@ public class HDFSCredentials implements CredentialsProvider { private void obtainTokensForNamenodes(final Credentials credentials, final Configuration config, - final User user, + final UserGroupInformation ugi, final Path[] paths) throws IOException, InterruptedException { LOG.info(String.format("\"%s\" is present in workflow configuration. Obtaining tokens for NameNode(s) [%s]", MRJobConfig.JOB_NAMENODES, config.get(MRJobConfig.JOB_NAMENODES))); - user.runAs( + ugi.doAs( new PrivilegedExceptionAction<Void>() { @Override public Void run() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/9d406cee/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 6f8b8fa..35608d5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3334 Don't use org.apache.hadoop.hbase.security.User in HDFSCredentials (gezapeti) OOZIE-3210 [build] Revision information is empty (asalamon74 via andras.piros) OOZIE-2684 Bad database schema error for WF_ACTIONS table (abhishekbafna, kmarton via andras.piros) OOZIE-3332 [examples] Spark examples should feature yarn client and cluster modes (daniel.becker via andras.piros)
