Repository: oozie Updated Branches: refs/heads/master e8a7b3cd3 -> 60f3d18f5
OOZIE-2221 Oozie audit log has null id for some of input request Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/60f3d18f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/60f3d18f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/60f3d18f Branch: refs/heads/master Commit: 60f3d18f5317c1a8b25d31ca5b9223990ba54553 Parents: e8a7b3c Author: Purshotam Shah <[email protected]> Authored: Thu Apr 30 16:29:25 2015 -0700 Committer: Purshotam Shah <[email protected]> Committed: Thu Apr 30 16:29:25 2015 -0700 ---------------------------------------------------------------------- .../oozie/command/coord/CoordUpdateXCommand.java | 2 ++ .../org/apache/oozie/servlet/JsonRestServlet.java | 17 ++++++++++++++++- release-log.txt | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/60f3d18f/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java index 92ad4f4..502a800 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java @@ -145,6 +145,8 @@ public class CoordUpdateXCommand extends CoordSubmitXCommand { } coordJob.setConf(XmlUtils.prettyPrint(conf).toString()); setJob(coordJob); + LogUtils.setLogInfo(coordJob); + } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/60f3d18f/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java index a409c22..db80c3d 100644 --- a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java +++ b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java @@ -39,6 +39,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.security.AccessControlException; import java.util.*; @@ -64,6 +65,8 @@ public abstract class JsonRestServlet extends HttpServlet { private XLog auditLog; XLog.Info logInfo; + private XLog LOG = XLog.getLog(getClass()); + /** * This bean defines a query string parameter. @@ -245,7 +248,7 @@ public abstract class JsonRestServlet extends HttpServlet { String param = (String) request.getAttribute(AUDIT_PARAM); String user = XLog.Info.get().getParameter(XLogService.USER); String group = XLog.Info.get().getParameter(XLogService.GROUP); - String jobId = XLog.Info.get().getParameter(DagXLogInfoService.JOB); + String jobId = getJobId(request); String app = XLog.Info.get().getParameter(DagXLogInfoService.APP); String errorCode = (String) request.getAttribute(AUDIT_ERROR_CODE); @@ -259,6 +262,18 @@ public abstract class JsonRestServlet extends HttpServlet { } } + private String getJobId(HttpServletRequest request) { + String jobId = XLog.Info.get().getParameter(DagXLogInfoService.JOB); + if (jobId == null) { + LOG.debug("JobId is not present in XLog.Info, getting it from HttpServletRequest" ); + jobId = getResourceName(request); + if (!(jobId.endsWith("-C") || jobId.endsWith("-B") || jobId.endsWith("-W") || jobId.contains("C@"))) { + jobId = null; + } + } + return jobId; + } + /** * Dispatches to super after loginfo and intrumentation handling. In case of errors dispatches error response codes * and does error logging. http://git-wip-us.apache.org/repos/asf/oozie/blob/60f3d18f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index f92c588..096bd4f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2221 Oozie audit log has null id for some of input request (puru) OOZIE-2223 Improve documentation with regard to Java action retries (ben.roling via bzhang) OOZIE-2218 META-INF directories in the war file have 777 permissions (rkanter) OOZIE-2130 Add EL Function for offsetting a date by a timezone amount including DST (rkanter)
