You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/06/12 09:34:04 UTC
[1/2] flink git commit: [FLINK-8946][metrics] Do not close TM
MetricGroup on JobManager failover
Repository: flink
Updated Branches:
refs/heads/release-1.5 9476a9b5f -> 6407675c2
[FLINK-8946][metrics] Do not close TM MetricGroup on JobManager failover
This closes #6060.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6407675c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6407675c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6407675c
Branch: refs/heads/release-1.5
Commit: 6407675c2dc47a2c1fa7d329c5fe027a5748e97b
Parents: 4706911
Author: yanghua <ya...@gmail.com>
Authored: Wed May 23 17:42:04 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Tue Jun 12 11:33:19 2018 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/taskmanager/TaskManager.scala | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6407675c/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
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 071a333..809c434 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
@@ -1077,13 +1077,6 @@ class TaskManager(
// clear the key-value location oracle
proxy.updateKvStateLocationOracle(HighAvailabilityServices.DEFAULT_JOB_ID, null)
}
-
- // failsafe shutdown of the metrics registry
- try {
- taskManagerMetricGroup.close()
- } catch {
- case t: Exception => log.warn("TaskManagerMetricGroup could not be closed successfully.", t)
- }
}
protected def handleJobManagerDisconnect(msg: String): Unit = {
[2/2] flink git commit: [FLINK-9398][cli] Only list non-terminal jobs
in running section
Posted by ch...@apache.org.
[FLINK-9398][cli] Only list non-terminal jobs in running section
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/47069114
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/47069114
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/47069114
Branch: refs/heads/release-1.5
Commit: 470691145bf67b60e07e5ed5ec302c8525689fee
Parents: 9476a9b
Author: Rong Rong <wa...@hotmail.com>
Authored: Mon Jun 11 10:35:29 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue Jun 12 11:33:19 2018 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/client/cli/CliFrontend.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/47069114/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
index fd12a73..f01f5b8 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
@@ -439,7 +439,7 @@ public class CliFrontend {
jobDetails.forEach(details -> {
if (details.getJobState() == JobStatus.CREATED) {
scheduledJobs.add(details);
- } else {
+ } else if (!details.getJobState().isGloballyTerminalState()) {
runningJobs.add(details);
}
});