You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2024/05/28 03:12:15 UTC

(flink) branch master updated: [hotfix] Fix modification conflict between FLINK-35465 and FLINK-35359

This is an automated email from the ASF dual-hosted git repository.

zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c417719972 [hotfix] Fix modification conflict between FLINK-35465 and FLINK-35359
6c417719972 is described below

commit 6c417719972e203de44df9540c1875de0070949d
Author: wangfeifan <zo...@163.com>
AuthorDate: Tue May 28 10:51:10 2024 +0800

    [hotfix] Fix modification conflict between FLINK-35465 and FLINK-35359
---
 .../test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java b/flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
index d38cd8a4db9..d23ae637434 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/scheduling/JMFailoverITCase.java
@@ -382,7 +382,7 @@ class JMFailoverITCase {
         NetUtils.Port jobManagerRpcPort = NetUtils.getAvailablePort();
         flinkConfiguration.set(ExecutionOptions.RUNTIME_MODE, RuntimeExecutionMode.BATCH);
         flinkConfiguration.set(JobManagerOptions.PORT, jobManagerRpcPort.getPort());
-        flinkConfiguration.set(JobManagerOptions.SLOT_REQUEST_TIMEOUT, 5000L);
+        flinkConfiguration.set(JobManagerOptions.SLOT_REQUEST_TIMEOUT, Duration.ofMillis(5000L));
         flinkConfiguration.set(RestOptions.BIND_PORT, "0");
         flinkConfiguration.set(TaskManagerOptions.TOTAL_PROCESS_MEMORY, MemorySize.parse("1g"));
         flinkConfiguration.set(TaskManagerOptions.NETWORK_MEMORY_FRACTION, 0.4F);