Repository: oozie Updated Branches: refs/heads/master 24f2b7cc6 -> 249280cbf
OOZIE-2072. Improve the whitelist error message by showing allowed values. (harsh) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f06bdc12 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f06bdc12 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f06bdc12 Branch: refs/heads/master Commit: f06bdc127d3f372464f26942c8d6ac7249cfc8c0 Parents: 24f2b7c Author: Harsh J <[email protected]> Authored: Thu Nov 20 21:42:25 2014 +0530 Committer: Harsh J <[email protected]> Committed: Tue Dec 2 03:39:05 2014 +0530 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/ErrorCode.java | 4 ++-- .../java/org/apache/oozie/service/HadoopAccessorService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f06bdc12/core/src/main/java/org/apache/oozie/ErrorCode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/ErrorCode.java b/core/src/main/java/org/apache/oozie/ErrorCode.java index 38bc790..710b27f 100644 --- a/core/src/main/java/org/apache/oozie/ErrorCode.java +++ b/core/src/main/java/org/apache/oozie/ErrorCode.java @@ -175,8 +175,8 @@ public enum ErrorCode { E0819(XLog.STD, "Unable to delete the temp dir of job WF Job [{0}]."), E0820(XLog.STD, "Action user retry max [{0}] is over system defined max [{1}], re-assign to use system max."), - E0900(XLog.OPS, "Jobtracker [{0}] not allowed, not in Oozie's whitelist"), - E0901(XLog.OPS, "Namenode [{0}] not allowed, not in Oozie's whitelist"), + E0900(XLog.OPS, "JobTracker [{0}] not allowed, not in Oozie's whitelist. Allowed values are: {1}"), + E0901(XLog.OPS, "NameNode [{0}] not allowed, not in Oozie's whitelist. Allowed values are: {1}"), E0902(XLog.OPS, "Exception occured: [{0}]"), E0903(XLog.OPS, "Invalid JobConf, it has not been created by HadoopAccessorService"), E0904(XLog.STD, "Scheme [{0}] not supported in uri [{1}]"), http://git-wip-us.apache.org/repos/asf/oozie/blob/f06bdc12/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java b/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java index ed0bdc3..18de48a 100644 --- a/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java +++ b/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java @@ -454,7 +454,7 @@ public class HadoopAccessorService implements Service { if (uri != null) { uri = uri.toLowerCase().trim(); if (whitelist.size() > 0 && !whitelist.contains(uri)) { - throw new HadoopAccessorException(error, uri); + throw new HadoopAccessorException(error, uri, whitelist); } } }
