OOZIE-3095 Job submit command is not logged in audit log (cherry picked from commit 01a7b893d438ad6b31bebb06c590c3998c04cf8b)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3b823bc1 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3b823bc1 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3b823bc1 Branch: refs/heads/branch-4.3 Commit: 3b823bc1cff5add51c3e3d50cfec512e1ace688e Parents: 78e2619 Author: puru <[email protected]> Authored: Wed Oct 25 16:13:06 2017 -0700 Committer: satishsaley <[email protected]> Committed: Sat Jan 6 12:28:05 2018 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/client/rest/RestConstants.java | 2 ++ .../src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java | 5 +++-- release-log.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3b823bc1/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java b/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java index 4129364..e1c1fb7 100644 --- a/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java +++ b/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java @@ -55,6 +55,8 @@ public interface RestConstants { String JOB_ACTION_START = "start"; + String JOB_ACTION_SUBMIT = "submit"; + String JOB_ACTION_DRYRUN = "dryrun"; String JOB_ACTION_SHOWDIFF = "diff"; http://git-wip-us.apache.org/repos/asf/oozie/blob/3b823bc1/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java b/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java index 41abeb1..d4b0871 100644 --- a/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java +++ b/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java @@ -81,8 +81,9 @@ public abstract class BaseJobsServlet extends JsonRestServlet { */ validateContentType(request, RestConstants.XML_CONTENT_TYPE); - request.setAttribute(AUDIT_OPERATION, request - .getParameter(RestConstants.ACTION_PARAM)); + String action = request.getParameter(RestConstants.ACTION_PARAM); + request.setAttribute(AUDIT_OPERATION, + (action != null) ? action : RestConstants.JOB_ACTION_SUBMIT); XConfiguration conf = new XConfiguration(request.getInputStream()); http://git-wip-us.apache.org/repos/asf/oozie/blob/3b823bc1/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index ad83061..a1c5f98 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.1 release +OOZIE-3095 Job submit command is not logged in audit log (puru) OOZIE-3077 SLA documentation fixes (satishsaley) OOZIE-3031 Coord job with only unresolved dependencies doesn't timeout (puru via satishsaley) OOZIE-3079 Filtering coordinators returns bundle id as null (satishsaley)
