oozie git commit: OOZIE-3183 Better logging for SshActionExecutor and extended HA capability when calling to remote host (andras.piros)

2018-02-14 Thread andras
Repository: oozie
Updated Branches:
  refs/heads/master 797da0198 -> e26641db4


OOZIE-3183 Better logging for SshActionExecutor and extended HA capability when 
calling to remote host (andras.piros)


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

Branch: refs/heads/master
Commit: e26641db469533ac059923c7ed28a5c74f71ad20
Parents: 797da01
Author: Andras Piros 
Authored: Wed Feb 14 11:12:57 2018 -0300
Committer: Andras Piros 
Committed: Wed Feb 14 11:12:57 2018 -0300

--
 .../oozie/action/ssh/SshActionExecutor.java | 58 ++--
 release-log.txt |  1 +
 2 files changed, 43 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/e26641db/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
--
diff --git 
a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java 
b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
index 0c97bb1..db0bcd6 100644
--- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
@@ -114,6 +114,7 @@ public class SshActionExecutor extends ActionExecutor {
  */
 @Override
 public void check(Context context, WorkflowAction action) throws 
ActionExecutorException {
+LOG.trace("check() start for action={0}", action.getId());
 Status status = getActionStatus(context, action);
 boolean captureOutput = false;
 try {
@@ -132,18 +133,24 @@ public class SshActionExecutor extends ActionExecutor {
 String dataCommand = SSH_COMMAND_BASE + action.getTrackerUri() 
+ " cat " + outFile;
 LOG.debug("Ssh command [{0}]", dataCommand);
 try {
-Process process = 
Runtime.getRuntime().exec(dataCommand.split("\\s"));
-StringBuffer buffer = new StringBuffer();
+final Process process = 
Runtime.getRuntime().exec(dataCommand.split("\\s"));
+
+final StringBuffer outBuffer = new StringBuffer();
+final StringBuffer errBuffer = new StringBuffer();
 boolean overflow = false;
-drainBuffers(process, buffer, null, maxLen);
-if (buffer.length() > maxLen) {
+drainBuffers(process, outBuffer, errBuffer, maxLen);
+LOG.trace("outBuffer={0}", outBuffer);
+LOG.trace("errBuffer={0}", errBuffer);
+if (outBuffer.length() > maxLen) {
 overflow = true;
 }
 if (overflow) {
 throw new 
ActionExecutorException(ActionExecutorException.ErrorType.ERROR,
   
"ERR_OUTPUT_EXCEED_MAX_LEN", "unknown error");
 }
-context.setExecutionData(status.toString(), 
PropertiesUtils.stringToProperties(buffer.toString()));
+context.setExecutionData(status.toString(), 
PropertiesUtils.stringToProperties(outBuffer.toString()));
+LOG.trace("Execution data set. status={0}, 
properties={1}", status,
+
PropertiesUtils.stringToProperties(outBuffer.toString()));
 }
 catch (Exception ex) {
 throw new 
ActionExecutorException(ActionExecutorException.ErrorType.ERROR, 
"ERR_UNKNOWN_ERROR",
@@ -151,17 +158,21 @@ public class SshActionExecutor extends ActionExecutor {
 }
 }
 else {
+LOG.trace("Execution data set to null. status={0}", status);
 context.setExecutionData(status.toString(), null);
 }
 }
 else {
 if (status == Status.ERROR) {
+LOG.warn("Execution data set to null in ERROR");
 context.setExecutionData(status.toString(), null);
 }
 else {
+LOG.warn("Execution data not set");
 context.setExternalStatus(status.toString());
 }
 }
+LOG.trace("check() end for action={0}", action);
 }
 
 /**
@@ -221,6 +232,8 @@ public class SshActionExecutor extends ActionExecutor {
 });
 String pid = "";
 
+LOG.trace("runningPid={0}", runningPid);
+
 if (runningPid == null) {
 final Element commandElement 

oozie git commit: OOZIE-3172 Upgrade non-transitive Jackson dependencies from org.codehaus.jackson to com.fasterxml.jackson (andras.piros)

2018-02-14 Thread andras
Repository: oozie
Updated Branches:
  refs/heads/master cb52b495f -> 797da0198


OOZIE-3172 Upgrade non-transitive Jackson dependencies from 
org.codehaus.jackson to com.fasterxml.jackson (andras.piros)


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

Branch: refs/heads/master
Commit: 797da019821f1eb043d343ba206f6f5568e33260
Parents: cb52b49
Author: Andras Piros 
Authored: Wed Feb 14 11:03:45 2018 -0300
Committer: Andras Piros 
Committed: Wed Feb 14 11:03:45 2018 -0300

--
 client/pom.xml  | 15 +--
 .../org/apache/oozie/client/OozieClient.java|  4 ++--
 .../event/jms/JSONMessageDeserializer.java  |  6 +++---
 .../event/message/CoordinatorActionMessage.java |  4 ++--
 .../client/event/message/EventMessage.java  |  5 +
 .../oozie/client/event/message/JobMessage.java  |  6 +++---
 .../oozie/client/event/message/SLAMessage.java  |  7 +++
 .../event/message/WorkflowJobMessage.java   |  4 ++--
 .../event/messaging/MessageSerializer.java  |  3 ++-
 .../oozie/util/FixedJsonInstanceSerializer.java | 20 ++--
 .../java/org/apache/oozie/util/TestZKUtils.java |  3 +--
 minitest/pom.xml| 15 +--
 pom.xml | 16 +++-
 release-log.txt |  1 +
 sharelib/oozie/pom.xml  |  6 ++
 .../oozie/action/hadoop/TestPasswordMasker.java |  2 +-
 16 files changed, 66 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/pom.xml
--
diff --git a/client/pom.xml b/client/pom.xml
index 3b67d12..31cd43f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -57,17 +57,20 @@
 test
 
 
-org.codehaus.jackson
-jackson-core-asl
+com.fasterxml.jackson.core
+jackson-annotations
 compile
 
-
 
-org.codehaus.jackson
-jackson-mapper-asl
+com.fasterxml.jackson.core
+jackson-core
+compile
+
+
+com.fasterxml.jackson.core
+jackson-databind
 compile
 
-
 
 org.apache.activemq
 activemq-client

http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/OozieClient.java
--
diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java 
b/client/src/main/java/org/apache/oozie/client/OozieClient.java
index e581e50..4c81756 100644
--- a/client/src/main/java/org/apache/oozie/client/OozieClient.java
+++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java
@@ -18,6 +18,8 @@
 
 package org.apache.oozie.client;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import org.apache.oozie.BuildInfo;
 import org.apache.oozie.cli.ValidationUtil;
@@ -61,8 +63,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
--
diff --git 
a/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
 
b/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
index aad2407..b8dd415 100644
--- 
a/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
+++ 
b/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
@@ -18,9 +18,9 @@
 
 package org.apache.oozie.client.event.jms;
 
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Message deserializer to convert from JSON to java object
@@ -30,7 +30,7 @@ public class JSONMessageDeserializer extends 
MessageDeserializer {
 static ObjectMapper mapper = new ObjectMapper(); // Thread-safe.
 
 static {
-

svn commit: r1025380 - /websites/production/oozie/content/

2018-02-14 Thread gezapeti
Author: gezapeti
Date: Wed Feb 14 12:06:26 2018
New Revision: 1025380

Log:
Apacher Oozie 4.3.1 release docs and new PMC members

Added:
websites/production/oozie/content/
  - copied from r1025379, websites/staging/oozie/trunk/content/



svn commit: r1025379 - in /websites/staging/oozie/trunk/content: ./ team-list.html

2018-02-14 Thread buildbot
Author: buildbot
Date: Wed Feb 14 11:58:04 2018
New Revision: 1025379

Log:
Staging update by buildbot for oozie

Modified:
websites/staging/oozie/trunk/content/   (props changed)
websites/staging/oozie/trunk/content/team-list.html

Propchange: websites/staging/oozie/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Feb 14 11:58:04 2018
@@ -1 +1 @@
-1824223
+1824227

Modified: websites/staging/oozie/trunk/content/team-list.html
==
--- websites/staging/oozie/trunk/content/team-list.html (original)
+++ websites/staging/oozie/trunk/content/team-list.html Wed Feb 14 11:58:04 2018
@@ -373,17 +373,17 @@
 pbacsko
 Peter Bacsko
 Cloudera
-committer
+committer, PMC member
 
 gezapeti
 (Geza) Peter Cseh
 Cloudera
-committer
+committer, PMC member
 
 asasvari
 Attila Sasvari
 Cloudera
-committer
+committer, PMC member
 
 andras
 Andras Piros




svn commit: r1025378 - in /websites/staging/oozie/trunk/content: ./ docs/4.3.1/ docs/4.3.1/client/ docs/4.3.1/client/apidocs/ docs/4.3.1/client/apidocs/org/ docs/4.3.1/client/apidocs/org/apache/ docs/

2018-02-14 Thread buildbot
Author: buildbot
Date: Wed Feb 14 11:54:44 2018
New Revision: 1025378

Log:
Staging update by buildbot for oozie


[This commit notification would consist of 585 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]


svn commit: r1824225 - /oozie/site/trunk/pom.xml

2018-02-14 Thread gezapeti
Author: gezapeti
Date: Wed Feb 14 11:34:40 2018
New Revision: 1824225

URL: http://svn.apache.org/viewvc?rev=1824225=rev
Log:
Update PMC members

Modified:
oozie/site/trunk/pom.xml

Modified: oozie/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/oozie/site/trunk/pom.xml?rev=1824225=1824224=1824225=diff
==
--- oozie/site/trunk/pom.xml (original)
+++ oozie/site/trunk/pom.xml Wed Feb 14 11:34:40 2018
@@ -18,18 +18,18 @@
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   4.0.0
-  
+
   
 org.apache
 apache
 7
-   
+  
 
   org.apache.oozie
   oozie-site
   1.0.0
   pom
-  
+
   Oozie
   http://oozie.apache.org/
   2011
@@ -275,6 +275,7 @@
 Cloudera
 
   committer
+  PMC member
 
   
   
@@ -283,6 +284,7 @@
 Cloudera
 
   committer
+  PMC member
 
   
   
@@ -291,6 +293,7 @@
 Cloudera
 
   committer
+  PMC member
 
   
   




svn commit: r1824223 - in /oozie/site/trunk: ./ content/ content/resources/docs/4.3.1/ content/resources/docs/4.3.1/client/ content/resources/docs/4.3.1/client/apidocs/ content/resources/docs/4.3.1/cl

2018-02-14 Thread gezapeti
Author: gezapeti
Date: Wed Feb 14 11:32:33 2018
New Revision: 1824223

URL: http://svn.apache.org/viewvc?rev=1824223=rev
Log:
Add docs for Oozie 4.3.1 release


[This commit notification would consist of 590 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]