You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by as...@apache.org on 2017/08/02 10:32:51 UTC

[1/2] oozie git commit: Revert "OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG"

Repository: oozie
Updated Branches:
  refs/heads/master 5c7210362 -> 311fda181


Revert "OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG"

This reverts commit 5c72103624d1f40a9bf4059511b56c7719095dcc.


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

Branch: refs/heads/master
Commit: 6bde9e4b5eb97909bdd4000feb0922882b5e65d8
Parents: 5c72103
Author: Attila Sasvari <as...@cloudera.com>
Authored: Wed Aug 2 12:29:54 2017 +0200
Committer: Attila Sasvari <as...@cloudera.com>
Committed: Wed Aug 2 12:29:54 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/oozie/service/EventHandlerService.java    | 7 -------
 release-log.txt                                               | 1 -
 2 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/6bde9e4b/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/EventHandlerService.java b/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
index 95508ec..a68f94f 100644
--- a/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
+++ b/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
@@ -30,7 +30,6 @@ import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.oozie.ErrorCode;
-import org.apache.oozie.action.hadoop.PasswordMasker;
 import org.apache.oozie.client.event.Event;
 import org.apache.oozie.client.event.Event.MessageType;
 import org.apache.oozie.client.event.JobEvent;
@@ -255,9 +254,6 @@ public class EventHandlerService implements Service {
                                 catch (Throwable error) {
                                     XLog.getLog(EventHandlerService.class).debug("Throwable in EventWorker thread run : ",
                                             error);
-                                    XLog.getLog(EventHandlerService.class).warn("Throwable in EventWorker thread run. " +
-                                                    "Error message: {0}",
-                                            new PasswordMasker().maskPasswordsIfNecessary(error.getMessage()));
                                 }
                             }
                         }
@@ -267,9 +263,6 @@ public class EventHandlerService implements Service {
             catch (Throwable error) {
                 XLog.getLog(EventHandlerService.class).debug("Throwable in EventWorker thread run : ",
                         error);
-                XLog.getLog(EventHandlerService.class).warn("Throwable in EventWorker thread run. " +
-                                "Error message: {0}",
-                        new PasswordMasker().maskPasswordsIfNecessary(error.getMessage()));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/6bde9e4b/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 1fe5e71..044119a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,6 +1,5 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
-OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG
 OOZIE-2931 Fix warnings during build for "no @param for" (Artem Ervits via gezapeti)
 OOZIE-2974 Change TestLiteWorkflowAppParser so that it works with Hadoop 3 (asasvari via gezapeti)
 OOZIE-2977 Fix javafoc error: self-closing element not allowed (Artem Ervits via gezapeti)


[2/2] oozie git commit: OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG (andras.piros via asasvari)

Posted by as...@apache.org.
OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG (andras.piros via asasvari)


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

Branch: refs/heads/master
Commit: 311fda18183091138ce3c4ce9fbf878d478a3861
Parents: 6bde9e4
Author: Attila Sasvari <as...@cloudera.com>
Authored: Wed Aug 2 12:32:43 2017 +0200
Committer: Attila Sasvari <as...@cloudera.com>
Committed: Wed Aug 2 12:32:43 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/oozie/service/EventHandlerService.java    | 7 +++++++
 release-log.txt                                               | 1 +
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/311fda18/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/EventHandlerService.java b/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
index a68f94f..95508ec 100644
--- a/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
+++ b/core/src/main/java/org/apache/oozie/service/EventHandlerService.java
@@ -30,6 +30,7 @@ import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.oozie.ErrorCode;
+import org.apache.oozie.action.hadoop.PasswordMasker;
 import org.apache.oozie.client.event.Event;
 import org.apache.oozie.client.event.Event.MessageType;
 import org.apache.oozie.client.event.JobEvent;
@@ -254,6 +255,9 @@ public class EventHandlerService implements Service {
                                 catch (Throwable error) {
                                     XLog.getLog(EventHandlerService.class).debug("Throwable in EventWorker thread run : ",
                                             error);
+                                    XLog.getLog(EventHandlerService.class).warn("Throwable in EventWorker thread run. " +
+                                                    "Error message: {0}",
+                                            new PasswordMasker().maskPasswordsIfNecessary(error.getMessage()));
                                 }
                             }
                         }
@@ -263,6 +267,9 @@ public class EventHandlerService implements Service {
             catch (Throwable error) {
                 XLog.getLog(EventHandlerService.class).debug("Throwable in EventWorker thread run : ",
                         error);
+                XLog.getLog(EventHandlerService.class).warn("Throwable in EventWorker thread run. " +
+                                "Error message: {0}",
+                        new PasswordMasker().maskPasswordsIfNecessary(error.getMessage()));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/311fda18/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 044119a..52d2dab 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG (andras.piros via asasvari)
 OOZIE-2931 Fix warnings during build for "no @param for" (Artem Ervits via gezapeti)
 OOZIE-2974 Change TestLiteWorkflowAppParser so that it works with Hadoop 3 (asasvari via gezapeti)
 OOZIE-2977 Fix javafoc error: self-closing element not allowed (Artem Ervits via gezapeti)