Repository: oozie Updated Branches: refs/heads/master 830897b32 -> 01a7b893d
OOZIE-3095 Job submit command is not logged in audit log Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/01a7b893 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/01a7b893 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/01a7b893 Branch: refs/heads/master Commit: 01a7b893d438ad6b31bebb06c590c3998c04cf8b Parents: 830897b Author: puru <[email protected]> Authored: Wed Oct 25 16:13:06 2017 -0700 Committer: puru <[email protected]> Committed: Wed Oct 25 16:13:06 2017 -0700 ---------------------------------------------------------------------- .../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/01a7b893/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 84998f6..9873ff3 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 @@ -59,6 +59,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/01a7b893/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 8dfd160..61d7c5e 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/01a7b893/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 210bb79..8cc66ef 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3095 Job submit command is not logged in audit log (puru) OOZIE-3096 Pre-commit job is timing out regularly (gezapeti) OOZIE-2406 Completely rewrite GraphGenerator code (andras.piros via gezapeti) OOZIE-3081 testSubmitWithLauncherQueue fails when FairScheduler is used (asasvari)
