[4/7] flink git commit: [FLINK-5194] [logging] Log heartbeats on TRACE level

2016-12-01 Thread uce
[FLINK-5194] [logging] Log heartbeats on TRACE level


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

Branch: refs/heads/master
Commit: 8228ac6e4d4e047e413ec316fc2ee3f5022b9afd
Parents: 3223a16
Author: Ufuk Celebi 
Authored: Tue Nov 29 17:15:27 2016 +0100
Committer: Ufuk Celebi 
Committed: Thu Dec 1 10:44:23 2016 +0100

--
 .../apache/flink/runtime/akka/FlinkUntypedActor.java  | 14 ++
 .../flink/runtime/instance/InstanceManager.java   |  4 +---
 .../apache/flink/runtime/jobmanager/JobManager.scala  |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/8228ac6e/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
index 5100d17..3255778 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
@@ -19,10 +19,8 @@
 package org.apache.flink.runtime.akka;
 
 import akka.actor.UntypedActor;
-
 import 
org.apache.flink.runtime.messages.JobManagerMessages.LeaderSessionMessage;
 import org.apache.flink.runtime.messages.RequiresLeaderSessionID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +38,7 @@ import java.util.UUID;
  * a leader session ID option which is returned by getLeaderSessionID.
  */
 public abstract class FlinkUntypedActor extends UntypedActor {
-   
+
protected final Logger LOG = LoggerFactory.getLogger(getClass());
 
/**
@@ -56,16 +54,16 @@ public abstract class FlinkUntypedActor extends 
UntypedActor {
 */
@Override
public final void onReceive(Object message) throws Exception {
-   if(LOG.isDebugEnabled()) {
-   LOG.debug("Received message {} at {} from {}.", 
message, getSelf().path(), getSender());
+   if(LOG.isTraceEnabled()) {
+   LOG.trace("Received message {} at {} from {}.", 
message, getSelf().path(), getSender());
 
long start = System.nanoTime();
 
handleLeaderSessionID(message);
 
-   long duration = (System.nanoTime() - start)/ 100;
+   long duration = (System.nanoTime() - start)/ 1_000_000;
 
-   LOG.debug("Handled message {} in {} ms from {}.", 
message, duration, getSender());
+   LOG.trace("Handled message {} in {} ms from {}.", 
message, duration, getSender());
} else {
handleLeaderSessionID(message);
}
@@ -81,7 +79,7 @@ public abstract class FlinkUntypedActor extends UntypedActor {
 * @throws Exception
 */
private void handleLeaderSessionID(Object message) throws Exception {
-   if(message instanceof LeaderSessionMessage) {
+   if (message instanceof LeaderSessionMessage) {
LeaderSessionMessage msg = (LeaderSessionMessage) 
message;
UUID expectedID = getLeaderSessionID();
UUID actualID = msg.leaderSessionID();

http://git-wip-us.apache.org/repos/asf/flink/blob/8228ac6e/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
index 65909db..1c2d66f 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
@@ -118,9 +118,7 @@ public class InstanceManager {
 
host.reportHeartBeat();
 
-   if (LOG.isDebugEnabled()) {
-   LOG.debug("Received heartbeat from TaskManager 
" + host);
-   }
+   LOG.trace("Received heartbeat from TaskManager {}", 
host);
 
return true;
}

http://git-wip-us.apache.org/repos/asf/flink/blob/8228ac6e/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
--
diff --git 
a/fli

[4/7] flink git commit: [FLINK-5194] [logging] Log heartbeats on TRACE level

2016-11-30 Thread uce
[FLINK-5194] [logging] Log heartbeats on TRACE level


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

Branch: refs/heads/release-1.1
Commit: ffe6b6b595cf80d4682e273803930f62139af9c0
Parents: 569a966
Author: Ufuk Celebi 
Authored: Tue Nov 29 17:15:27 2016 +0100
Committer: Ufuk Celebi 
Committed: Wed Nov 30 16:22:11 2016 +0100

--
 .../apache/flink/runtime/akka/FlinkUntypedActor.java  | 14 ++
 .../flink/runtime/instance/InstanceManager.java   |  4 +---
 .../apache/flink/runtime/jobmanager/JobManager.scala  |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/ffe6b6b5/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
index 5100d17..3255778 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/FlinkUntypedActor.java
@@ -19,10 +19,8 @@
 package org.apache.flink.runtime.akka;
 
 import akka.actor.UntypedActor;
-
 import 
org.apache.flink.runtime.messages.JobManagerMessages.LeaderSessionMessage;
 import org.apache.flink.runtime.messages.RequiresLeaderSessionID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +38,7 @@ import java.util.UUID;
  * a leader session ID option which is returned by getLeaderSessionID.
  */
 public abstract class FlinkUntypedActor extends UntypedActor {
-   
+
protected final Logger LOG = LoggerFactory.getLogger(getClass());
 
/**
@@ -56,16 +54,16 @@ public abstract class FlinkUntypedActor extends 
UntypedActor {
 */
@Override
public final void onReceive(Object message) throws Exception {
-   if(LOG.isDebugEnabled()) {
-   LOG.debug("Received message {} at {} from {}.", 
message, getSelf().path(), getSender());
+   if(LOG.isTraceEnabled()) {
+   LOG.trace("Received message {} at {} from {}.", 
message, getSelf().path(), getSender());
 
long start = System.nanoTime();
 
handleLeaderSessionID(message);
 
-   long duration = (System.nanoTime() - start)/ 100;
+   long duration = (System.nanoTime() - start)/ 1_000_000;
 
-   LOG.debug("Handled message {} in {} ms from {}.", 
message, duration, getSender());
+   LOG.trace("Handled message {} in {} ms from {}.", 
message, duration, getSender());
} else {
handleLeaderSessionID(message);
}
@@ -81,7 +79,7 @@ public abstract class FlinkUntypedActor extends UntypedActor {
 * @throws Exception
 */
private void handleLeaderSessionID(Object message) throws Exception {
-   if(message instanceof LeaderSessionMessage) {
+   if (message instanceof LeaderSessionMessage) {
LeaderSessionMessage msg = (LeaderSessionMessage) 
message;
UUID expectedID = getLeaderSessionID();
UUID actualID = msg.leaderSessionID();

http://git-wip-us.apache.org/repos/asf/flink/blob/ffe6b6b5/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
--
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
index 0d0d4c7..3fe92a5 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java
@@ -124,9 +124,7 @@ public class InstanceManager {
host.reportHeartBeat();
host.setMetricsReport(lastMetricsReport);
 
-   if (LOG.isDebugEnabled()) {
-   LOG.debug("Received heartbeat from TaskManager 
" + host);
-   }
+   LOG.trace("Received heartbeat from TaskManager {}", 
host);
 
return true;
}

http://git-wip-us.apache.org/repos/asf/flink/blob/ffe6b6b5/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
--