oozie git commit: OOZIE-3095 Job submit command is not logged in audit log

2017-10-25 Thread puru
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 
Authored: Wed Oct 25 16:13:06 2017 -0700
Committer: puru 
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)



oozie git commit: OOZIE-3096 Pre-commit job is timing out regularly (gezapeti)

2017-10-25 Thread gezapeti
Repository: oozie
Updated Branches:
  refs/heads/master 883c7556d -> 830897b32


OOZIE-3096 Pre-commit job is timing out regularly (gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/830897b3
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/830897b3
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/830897b3

Branch: refs/heads/master
Commit: 830897b327897b3f0beb80c146ac1e7c49a3bec6
Parents: 883c755
Author: Gezapeti Cseh 
Authored: Wed Oct 25 16:45:07 2017 +0200
Committer: Gezapeti Cseh 
Committed: Wed Oct 25 16:45:07 2017 +0200

--
 pom.xml | 2 +-
 release-log.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/830897b3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index be153c1..7758265 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 once
 
 
true
--Xmx1024m -da
+-Xmx2048m -da
 
 
 ${oozie.test.dir}

http://git-wip-us.apache.org/repos/asf/oozie/blob/830897b3/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index ce0b458..210bb79 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+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)
 OOZIE-3082 Move org.apache.oozie.action.hadoop.ActionStats to Oozie ShareLib 
(asasvari)