You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/04/27 14:49:52 UTC
[2/4] flink git commit: [hotfix][metrics] remove an unnecessary check
for non-null
[hotfix][metrics] remove an unnecessary check for non-null
The metrics group given to a Task must always be non-null otherwise the code
would have crashed anyway. Similarly, the group returned by getIOMetricGroup()
is always present.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/931ce05a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/931ce05a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/931ce05a
Branch: refs/heads/master
Commit: 931ce05a47ce1063c056c1a558a974fbce559f41
Parents: 6cba8bb
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Mon Feb 27 11:14:35 2017 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Thu Apr 27 15:14:09 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/runtime/taskmanager/Task.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/931ce05a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
index f3dacc3..5a402fd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
@@ -74,6 +74,7 @@ import org.apache.flink.util.SerializedValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URL;
@@ -280,7 +281,7 @@ public class Task implements Runnable, TaskActions {
LibraryCacheManager libraryCache,
FileCache fileCache,
TaskManagerRuntimeInfo taskManagerConfig,
- TaskMetricGroup metricGroup,
+ @Nonnull TaskMetricGroup metricGroup,
ResultPartitionConsumableNotifier resultPartitionConsumableNotifier,
PartitionProducerStateChecker partitionProducerStateChecker,
Executor executor) {
@@ -408,10 +409,8 @@ public class Task implements Runnable, TaskActions {
// finally, create the executing thread, but do not start it
executingThread = new Thread(TASK_THREADS_GROUP, this, taskNameWithSubtask);
- if (this.metrics != null && this.metrics.getIOMetricGroup() != null) {
- // add metrics for buffers
- this.metrics.getIOMetricGroup().initializeBufferMetrics(this);
- }
+ // add metrics for buffers
+ this.metrics.getIOMetricGroup().initializeBufferMetrics(this);
}
// ------------------------------------------------------------------------