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:41:13 UTC
[flink] branch master updated (c4beb3a -> f1718cf)
This is an automated email from the ASF dual-hosted git repository.
gary pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from c4beb3a [FLINK-10269] [connectors] Fix Elasticsearch 6 UpdateRequest binary incompatibility
new a7a06b0 [FLINK-10223][LOG]Logging with resourceId during taskmanager startup
new f1718cf [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] 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 master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f1718cfd2e33c2d2e91636d55d72880327fe9fe0
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 1ce29af..3984483 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
@@ -710,7 +710,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>() {
[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 master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a7a06b05bb714cd212f3c672a5b886a5ee82a705
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 eb6df19..1ce29af 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
@@ -710,6 +710,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 afe22de..5c1f420 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
@@ -349,6 +349,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 6d27dc3..66630f4 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
@@ -350,7 +350,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 c04084c..2008ad8 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
@@ -1831,7 +1831,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.