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/07/31 11:47:51 UTC
[flink] branch release-1.5 updated: [FLINK-9923][tests] Harden
OneInputStreamTaskTest#testWatermarkMetrics
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.5
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.5 by this push:
new 9f1f0a8 [FLINK-9923][tests] Harden OneInputStreamTaskTest#testWatermarkMetrics
9f1f0a8 is described below
commit 9f1f0a87bddead122f0aabdc266f44efb7ed6fc4
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Mon Jul 23 22:25:25 2018 +0200
[FLINK-9923][tests] Harden OneInputStreamTaskTest#testWatermarkMetrics
Make WatermarkGauge's currentWatermark field volatile because writes
and reads can happen from different threads.
This closes #6398.
---
.../org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
index 42c7000..462a7b4 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
@@ -25,10 +25,10 @@ import org.apache.flink.metrics.Gauge;
*/
public class WatermarkGauge implements Gauge<Long> {
- private long currentWatermark = Long.MIN_VALUE;
+ private volatile long currentWatermark = Long.MIN_VALUE;
public void setCurrentWatermark(long watermark) {
- this.currentWatermark = watermark;
+ currentWatermark = watermark;
}
@Override