You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ga...@apache.org on 2018/09/13 19:37:03 UTC
[flink] branch release-1.5 updated (3b3cc12 -> 94a7a15)
This is an automated email from the ASF dual-hosted git repository.
gary pushed a change to branch release-1.5
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 3b3cc12 [FLINK-10301][network] extend StreamNetworkBenchmarkEnvironment to allow custom Configuration instances
new 9cbf99e [FLINK-10223][LOG]Logging with resourceId during taskmanager startup
new 94a7a15 [FLINK-10223][logging] Add 'ResourceID' to log message.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/flink/runtime/resourcemanager/ResourceManager.java | 1 +
.../java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java | 2 ++
.../src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala | 2 +-
.../main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
[flink] 01/02: [FLINK-10223][LOG]Logging with resourceId during
taskmanager startup
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gary pushed a commit to branch release-1.5
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9cbf99e7a56c50ba4e7bd5ee6444f6a08b4e5796
Author: minwenjun <mi...@didichuxing.com>
AuthorDate: Tue Sep 11 07:58:57 2018 +0800
[FLINK-10223][LOG]Logging with resourceId during taskmanager startup
centralize location & resourceId info at the master node
This closes #6679.
---
.../java/org/apache/flink/runtime/resourcemanager/ResourceManager.java | 1 +
.../java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java | 2 ++
.../src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala | 2 +-
.../main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
index d8a41d5..61fae49 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
@@ -716,6 +716,7 @@ public abstract class ResourceManager<WorkerType extends ResourceIDRetrievable>
WorkerRegistration<WorkerType> registration =
new WorkerRegistration<>(taskExecutorGateway, newWorker, dataPort, hardwareDescription);
+ log.info("Registering TaskManager {} ({}) at ResourceManager", taskExecutorResourceId, taskExecutorAddress);
taskExecutors.put(taskExecutorResourceId, registration);
taskManagerHeartbeatManager.monitorTarget(taskExecutorResourceId, new HeartbeatTarget<Void>() {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
index 6c5a41d..1cd61fe 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
@@ -332,6 +332,8 @@ public class TaskManagerRunner implements FatalErrorHandler, AutoCloseableAsync
checkNotNull(rpcService);
checkNotNull(highAvailabilityServices);
+ LOG.info("Starting TaskManager with ResourceID: {}", resourceID);
+
InetAddress remoteAddress = InetAddress.getByName(rpcService.getAddress());
TaskManagerServicesConfiguration taskManagerServicesConfiguration =
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 2000f7d..d55dacd 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -349,7 +349,7 @@ class JobManager(
hardwareInformation,
numberOfSlots) =>
// we are being informed by the ResourceManager that a new task manager is available
- log.debug(s"RegisterTaskManager: $msg")
+ log.info(s"RegisterTaskManager: $msg")
val taskManager = sender()
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 06a0950..0416643 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -1822,7 +1822,7 @@ object TaskManager {
taskManagerClass: Class[_ <: TaskManager])
: Unit = {
- LOG.info("Starting TaskManager")
+ LOG.info(s"Starting TaskManager with ResourceID: $resourceID")
// Bring up the TaskManager actor system first, bind it to the given address.
[flink] 02/02: [FLINK-10223][logging] Add 'ResourceID' to log
message.
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gary pushed a commit to branch release-1.5
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 94a7a15d1ea3841742123471c79aeb1e454c3b3b
Author: gyao <ga...@data-artisans.com>
AuthorDate: Thu Sep 13 15:48:09 2018 +0200
[FLINK-10223][logging] Add 'ResourceID' to log message.
---
.../java/org/apache/flink/runtime/resourcemanager/ResourceManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
index 61fae49..87c4964 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
@@ -716,7 +716,7 @@ public abstract class ResourceManager<WorkerType extends ResourceIDRetrievable>
WorkerRegistration<WorkerType> registration =
new WorkerRegistration<>(taskExecutorGateway, newWorker, dataPort, hardwareDescription);
- log.info("Registering TaskManager {} ({}) at ResourceManager", taskExecutorResourceId, taskExecutorAddress);
+ log.info("Registering TaskManager with ResourceID {} ({}) at ResourceManager", taskExecutorResourceId, taskExecutorAddress);
taskExecutors.put(taskExecutorResourceId, registration);
taskManagerHeartbeatManager.monitorTarget(taskExecutorResourceId, new HeartbeatTarget<Void>() {