Repository: flink
Updated Branches:
  refs/heads/master 436c3335b -> 5dc624bf8


[FLINK-3660][hotfix] Add missing default value in ConfigConstants


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

Branch: refs/heads/master
Commit: 5dc624bf816093ca0c240c7bcfe37841605ce592
Parents: 436c333
Author: Robert Metzger <rmetz...@apache.org>
Authored: Fri Oct 14 15:18:09 2016 +0200
Committer: Robert Metzger <rmetz...@apache.org>
Committed: Fri Oct 14 15:18:19 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/configuration/ConfigConstants.java   | 6 ++++++
 .../flink/streaming/api/operators/AbstractStreamOperator.java  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5dc624bf/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git 
a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java 
b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index 3fe0306..a828281 100644
--- 
a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ 
b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -1303,6 +1303,12 @@ public final class ConfigConstants {
        /** Default retry delay on location lookup failures. */
        public static final int 
DEFAULT_QUERYABLE_STATE_CLIENT_LOOKUP_RETRY_DELAY = 1000;
 
+       // ----------------------------- Metrics ----------------------------
+
+       /** The default number of measured latencies to maintain at each 
operator */
+       public static final int DEFAULT_METRICS_LATENCY_HISTORY_SIZE = 128;
+
+
        // ----------------------------- Environment Variables 
----------------------------
 
        /** The environment variable name which contains the location of the 
configuration directory */

http://git-wip-us.apache.org/repos/asf/flink/blob/5dc624bf/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
----------------------------------------------------------------------
diff --git 
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
 
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
index 77e4d9a..167dfb0 100644
--- 
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
+++ 
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
@@ -134,7 +134,7 @@ public abstract class AbstractStreamOperator<OUT>
                Configuration taskManagerConfig = 
container.getEnvironment().getTaskManagerInfo().getConfiguration();
                int historySize = 
taskManagerConfig.getInteger(ConfigConstants.METRICS_LATENCY_HISTORY_SIZE, 
ConfigConstants.DEFAULT_METRICS_LATENCY_HISTORY_SIZE);
                if (historySize <= 0) {
-                       LOG.warn("{} has been set to a value below 0: {}. Using 
default.", ConfigConstants.METRICS_LATENCY_HISTORY_SIZE, historySize);
+                       LOG.warn("{} has been set to a value equal or below 0: 
{}. Using default.", ConfigConstants.METRICS_LATENCY_HISTORY_SIZE, historySize);
                        historySize = 
ConfigConstants.DEFAULT_METRICS_LATENCY_HISTORY_SIZE;
                }
 

Reply via email to