You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ro...@apache.org on 2022/08/26 11:57:34 UTC
[flink] branch release-1.15 updated (62d7cc0ee4b -> 493a1aa8556)
This is an automated email from the ASF dual-hosted git repository.
roman pushed a change to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
from 62d7cc0ee4b Update japicmp configuration for 1.15.2
new 258c3e35265 [hotfix][tests] Use negative changelog materialization interval in tests
new 605a7118a01 [hotfix][state] Fix logging in Materializer and make FLINK-28976 more explicit
new 493a1aa8556 [FLINK-28976][state] Don't add extra delay to the 1st materialization
The 3 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:
.../flink/state/changelog/PeriodicMaterializationManager.java | 11 ++++-------
.../apache/flink/streaming/util/TestStreamEnvironment.java | 3 +--
2 files changed, 5 insertions(+), 9 deletions(-)
[flink] 03/03: [FLINK-28976][state] Don't add extra delay to the 1st materialization
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
roman pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 493a1aa8556038283e256efc5368bd319bd06d17
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Mon Aug 15 19:30:36 2022 +0200
[FLINK-28976][state] Don't add extra delay to the 1st materialization
---
.../apache/flink/state/changelog/PeriodicMaterializationManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
index 66c75c670e9..2dfe11d3886 100644
--- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
+++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
@@ -114,7 +114,7 @@ class PeriodicMaterializationManager implements Closeable {
LOG.info("Task {} starts periodic materialization", subtaskName);
- scheduleNextMaterialization(periodicMaterializeDelay + initialDelay);
+ scheduleNextMaterialization(initialDelay);
}
}
[flink] 02/03: [hotfix][state] Fix logging in Materializer and make FLINK-28976 more explicit
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
roman pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 605a7118a018a716b7715834f5b3f63f3e7064af
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Mon Aug 15 19:29:58 2022 +0200
[hotfix][state] Fix logging in Materializer and make FLINK-28976 more explicit
(cherry picked from commit 0e083c119b24a9b5fa7af1ad274c9ee7111c07cc)
---
.../state/changelog/PeriodicMaterializationManager.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
index d51d7958cd3..66c75c670e9 100644
--- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
+++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PeriodicMaterializationManager.java
@@ -114,7 +114,7 @@ class PeriodicMaterializationManager implements Closeable {
LOG.info("Task {} starts periodic materialization", subtaskName);
- scheduleNextMaterialization(initialDelay);
+ scheduleNextMaterialization(periodicMaterializeDelay + initialDelay);
}
}
@@ -255,22 +255,19 @@ class PeriodicMaterializationManager implements Closeable {
}
private void scheduleNextMaterialization() {
- scheduleNextMaterialization(0);
+ scheduleNextMaterialization(periodicMaterializeDelay);
}
// task thread and asyncOperationsThreadPool can access this method
- private synchronized void scheduleNextMaterialization(long offset) {
+ private synchronized void scheduleNextMaterialization(long delay) {
if (started && !periodicExecutor.isShutdown()) {
LOG.info(
"Task {} schedules the next materialization in {} seconds",
subtaskName,
- periodicMaterializeDelay / 1000);
+ delay / 1000);
- periodicExecutor.schedule(
- this::triggerMaterialization,
- periodicMaterializeDelay + offset,
- TimeUnit.MILLISECONDS);
+ periodicExecutor.schedule(this::triggerMaterialization, delay, TimeUnit.MILLISECONDS);
}
}
[flink] 01/03: [hotfix][tests] Use negative changelog materialization interval in tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
roman pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 258c3e35265bb3a966bd317340f2a5fe7cfd7364
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Wed Aug 24 18:20:02 2022 +0200
[hotfix][tests] Use negative changelog materialization interval in tests
...instead of a big value so that the subsequent change won't break them.
---
.../java/org/apache/flink/streaming/util/TestStreamEnvironment.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
index e9ec8314bf8..b56fdfe449c 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
@@ -138,8 +138,7 @@ public class TestStreamEnvironment extends StreamExecutionEnvironment {
Duration.ofMillis(500),
Duration.ofSeconds(1),
Duration.ofSeconds(5),
- Duration.ofSeconds(
- Long.MAX_VALUE / 1000 /* max allowed by Duration.toMillis */));
+ Duration.ofSeconds(-1));
miniCluster.overrideRestoreModeForChangelogStateBackend();
}
}