Repository: oozie Updated Branches: refs/heads/master 5778c6f56 -> 79ccfdd78
OOZIE-2733 change org.apache.hadoop.fs.permission.AccessControlException to org.apache.hadoop.security.AccessControlException (gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/79ccfdd7 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/79ccfdd7 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/79ccfdd7 Branch: refs/heads/master Commit: 79ccfdd789fbb465356732ec6f16f83985b72b3e Parents: 5778c6f Author: Gezapeti Cseh <[email protected]> Authored: Wed Jun 28 14:28:25 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Wed Jun 28 14:28:25 2017 +0200 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 2 +- .../java/org/apache/oozie/service/AuthorizationService.java | 9 +++------ release-log.txt | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/79ccfdd7/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 465cd9e..eac8e62 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 @@ -48,8 +48,8 @@ import org.apache.hadoop.filecache.DistributedCache; 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.DataOutputBuffer; +import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.mapred.JobClient; http://git-wip-us.apache.org/repos/asf/oozie/blob/79ccfdd7/core/src/main/java/org/apache/oozie/service/AuthorizationService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/AuthorizationService.java b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java index f4ccf4f..49bc672 100644 --- a/core/src/main/java/org/apache/oozie/service/AuthorizationService.java +++ b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java @@ -34,6 +34,7 @@ import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.security.AccessControlException; import org.apache.oozie.BundleJobBean; import org.apache.oozie.CoordinatorJobBean; import org.apache.oozie.ErrorCode; @@ -338,9 +339,7 @@ public class AuthorizationService implements Service { } fs.open(wfXml).close(); } - // TODO change this when stopping support of 0.18 to the new - // Exception - catch (org.apache.hadoop.fs.permission.AccessControlException ex) { + catch (AccessControlException ex) { incrCounter(INSTR_FAILED_AUTH_COUNTER, 1); throw new AuthorizationException(ErrorCode.E0507, appPath, ex.getMessage(), ex); } @@ -394,9 +393,7 @@ public class AuthorizationService implements Service { } } } - // TODO change this when stopping support of 0.18 to the new - // Exception - catch (org.apache.hadoop.fs.permission.AccessControlException ex) { + catch (AccessControlException ex) { incrCounter(INSTR_FAILED_AUTH_COUNTER, 1); throw new AuthorizationException(ErrorCode.E0507, appPath, ex.getMessage(), ex); } http://git-wip-us.apache.org/repos/asf/oozie/blob/79ccfdd7/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 8f97085..3cd95af 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2733 change org.apache.hadoop.fs.permission.AccessControlException to org.apache.hadoop.security.AccessControlException (gezapeti) OOZIE-2884 consolidate hadoop versions in pomfiles (Artem Ervits via gezapeti) OOZIE-2794 Hive and Pig tests failing when multiple pre-commit jobs are running (gezapeti) OOZIE-2849 Fix build warnings when assembling directories (asasvari via gezapeti)
