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 2021/11/05 13:41:57 UTC

[flink] branch release-1.14 updated (3e341d0 -> 341c13a)

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

chesnay pushed a change to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from 3e341d0  [FLINK-24551][runtime] Read BUFFER_DEBLOAT_SAMPLES from task manager configuration instead of task configuration
     new 234ba71  [FLINK-24706][tests] Increase restart delay to 5 seconds
     new 1eb52bd  [FLINK-24706][coordination] Strip completion exception in HeartbeatManager
     new 4651be9  [FLINK-24706][rpc] Forward deserialization errors to returned future
     new 77d4f3a  [FLINK-24609][akka][build] Use same Scala properties as root pom
     new 341c13a  [FLINK-24550][rpc] Use ContextClassLoader for message deserialization

The 5 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-rpc/flink-rpc-akka/pom.xml                   | 23 ++++---
 .../runtime/rpc/akka/AkkaInvocationHandler.java    | 21 ++++--
 .../flink/runtime/rpc/akka/AkkaRpcActorTest.java   | 76 +++++++++++++++++++++
 .../rpc/akka/ContextClassLoadingSettingTest.java   | 78 ++++++++++++++++++++++
 .../runtime/heartbeat/HeartbeatManagerImpl.java    |  4 +-
 ...skManagerProcessFailureBatchRecoveryITCase.java |  2 +-
 6 files changed, 186 insertions(+), 18 deletions(-)

[flink] 02/05: [FLINK-24706][coordination] Strip completion exception in HeartbeatManager

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 1eb52bd3138554c64ff5e9c972cb19ba3aa8d277
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 2 14:05:39 2021 +0100

    [FLINK-24706][coordination] Strip completion exception in HeartbeatManager
---
 .../java/org/apache/flink/runtime/heartbeat/HeartbeatManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerImpl.java
index 3063581..71e7c2e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerImpl.java
@@ -20,6 +20,7 @@ package org.apache.flink.runtime.heartbeat;
 
 import org.apache.flink.runtime.clusterframework.types.ResourceID;
 import org.apache.flink.runtime.rpc.exceptions.RecipientUnreachableException;
+import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.Preconditions;
 import org.apache.flink.util.concurrent.FutureUtils;
 import org.apache.flink.util.concurrent.ScheduledExecutor;
@@ -244,7 +245,8 @@ public class HeartbeatManagerImpl<I, O> implements HeartbeatManager<I, O> {
     protected BiConsumer<Void, Throwable> handleHeartbeatRpc(ResourceID heartbeatTarget) {
         return (unused, failure) -> {
             if (failure != null) {
-                handleHeartbeatRpcFailure(heartbeatTarget, failure);
+                handleHeartbeatRpcFailure(
+                        heartbeatTarget, ExceptionUtils.stripCompletionException(failure));
             } else {
                 handleHeartbeatRpcSuccess(heartbeatTarget);
             }

[flink] 04/05: [FLINK-24609][akka][build] Use same Scala properties as root pom

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 77d4f3aad0061cddced9ea93e6f0f5f17e6adb57
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Oct 21 12:40:01 2021 +0200

    [FLINK-24609][akka][build] Use same Scala properties as root pom
    
    Maven does not properly resolve dependencyManagement entries if the parent/child module declare one for the same dependency with different properties being used in the artifactId.
    Hence we unfortunately need to use the same property names, which should however not cause issues in the future (if say, a 2.13 profile is introduced), because the properties defined in the child take precedence.
---
 flink-rpc/flink-rpc-akka/pom.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/flink-rpc/flink-rpc-akka/pom.xml b/flink-rpc/flink-rpc-akka/pom.xml
index 8541fb3..368d36e 100644
--- a/flink-rpc/flink-rpc-akka/pom.xml
+++ b/flink-rpc/flink-rpc-akka/pom.xml
@@ -35,8 +35,8 @@ under the License.
 
 	<properties>
 		<akka.version>2.6.15</akka.version>
-		<akka.scala.binary.version>2.12</akka.scala.binary.version>
-		<akka.scala.version>2.12.7</akka.scala.version>
+		<scala.binary.version>2.12</scala.binary.version>
+		<scala.version>2.12.7</scala.version>
 	</properties>
 
 	<dependencies>
@@ -72,12 +72,12 @@ under the License.
 
 		<dependency>
 			<groupId>com.typesafe.akka</groupId>
-			<artifactId>akka-actor_${akka.scala.binary.version}</artifactId>
+			<artifactId>akka-actor_${scala.binary.version}</artifactId>
 			<version>${akka.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.typesafe.akka</groupId>
-			<artifactId>akka-remote_${akka.scala.binary.version}</artifactId>
+			<artifactId>akka-remote_${scala.binary.version}</artifactId>
 			<version>${akka.version}</version>
 			<exclusions>
 				<exclusion>
@@ -94,7 +94,7 @@ under the License.
 		</dependency>
 		<dependency>
 			<groupId>com.typesafe.akka</groupId>
-			<artifactId>akka-slf4j_${akka.scala.binary.version}</artifactId>
+			<artifactId>akka-slf4j_${scala.binary.version}</artifactId>
 			<version>${akka.version}</version>
 		</dependency>
 		<dependency>
@@ -105,7 +105,7 @@ under the License.
 
 		<dependency>
 			<groupId>org.clapper</groupId>
-			<artifactId>grizzled-slf4j_${akka.scala.binary.version}</artifactId>
+			<artifactId>grizzled-slf4j_${scala.binary.version}</artifactId>
 			<version>1.3.2</version>
 		</dependency>
 
@@ -140,17 +140,22 @@ under the License.
 			<dependency>
 				<groupId>org.scala-lang</groupId>
 				<artifactId>scala-compiler</artifactId>
-				<version>${akka.scala.version}</version>
+				<version>${scala.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.scala-lang</groupId>
 				<artifactId>scala-library</artifactId>
-				<version>${akka.scala.version}</version>
+				<version>${scala.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.scala-lang</groupId>
 				<artifactId>scala-reflect</artifactId>
-				<version>${akka.scala.version}</version>
+				<version>${scala.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.scala-lang.modules</groupId>
+				<artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+				<version>1.1.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

[flink] 05/05: [FLINK-24550][rpc] Use ContextClassLoader for message deserialization

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 341c13aed36f8d3d633298645002af516dec9050
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Nov 4 12:36:49 2021 +0100

    [FLINK-24550][rpc] Use ContextClassLoader for message deserialization
---
 .../runtime/rpc/akka/AkkaInvocationHandler.java    | 10 +--
 .../rpc/akka/ContextClassLoadingSettingTest.java   | 78 ++++++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
index db73771..ae43b2f 100644
--- a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
+++ b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
@@ -240,7 +240,9 @@ class AkkaInvocationHandler implements InvocationHandler, AkkaBasedEndpoint, Rpc
             final CompletableFuture<?> resultFuture =
                     ask(rpcInvocation, futureTimeout)
                             .thenApply(
-                                    resultValue -> deserializeValueIfNeeded(resultValue, method));
+                                    resultValue ->
+                                            deserializeValueIfNeeded(
+                                                    resultValue, method, flinkClassLoader));
 
             final CompletableFuture<Object> completableFuture = new CompletableFuture<>();
             resultFuture.whenComplete(
@@ -414,11 +416,11 @@ class AkkaInvocationHandler implements InvocationHandler, AkkaBasedEndpoint, Rpc
         return terminationFuture;
     }
 
-    static Object deserializeValueIfNeeded(Object o, Method method) {
+    private static Object deserializeValueIfNeeded(
+            Object o, Method method, ClassLoader flinkClassLoader) {
         if (o instanceof AkkaRpcSerializedValue) {
             try {
-                return ((AkkaRpcSerializedValue) o)
-                        .deserializeValue(AkkaInvocationHandler.class.getClassLoader());
+                return ((AkkaRpcSerializedValue) o).deserializeValue(flinkClassLoader);
             } catch (IOException | ClassNotFoundException e) {
                 throw new CompletionException(
                         new RpcException(
diff --git a/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/ContextClassLoadingSettingTest.java b/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/ContextClassLoadingSettingTest.java
index 1a585a1..ae62839 100644
--- a/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/ContextClassLoadingSettingTest.java
+++ b/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/ContextClassLoadingSettingTest.java
@@ -18,10 +18,12 @@
 package org.apache.flink.runtime.rpc.akka;
 
 import org.apache.flink.api.common.time.Time;
+import org.apache.flink.configuration.Configuration;
 import org.apache.flink.runtime.concurrent.akka.AkkaFutureUtils;
 import org.apache.flink.runtime.rpc.RpcEndpoint;
 import org.apache.flink.runtime.rpc.RpcGateway;
 import org.apache.flink.runtime.rpc.RpcService;
+import org.apache.flink.runtime.rpc.RpcUtils;
 import org.apache.flink.util.TestLogger;
 import org.apache.flink.util.concurrent.FutureUtils;
 
@@ -31,6 +33,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.annotation.Nullable;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
@@ -39,6 +46,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 
 import static org.apache.flink.runtime.concurrent.akka.ClassLoadingUtils.runWithContextClassLoader;
 import static org.hamcrest.CoreMatchers.either;
@@ -82,6 +90,8 @@ public class ContextClassLoadingSettingTest extends TestLogger {
                         actorSystem,
                         AkkaRpcServiceConfiguration.defaultConfiguration(),
                         pretendFlinkClassLoader);
+
+        PickyObject.classLoaderAssertion = this::assertIsFlinkClassLoader;
     }
 
     @After
@@ -281,6 +291,50 @@ public class ContextClassLoadingSettingTest extends TestLogger {
     }
 
     @Test
+    public void testAkkaRpcInvocationHandler_ContextClassLoaderUsedForDeserialization()
+            throws Exception {
+        // setup 2 actor systems and rpc services that support remote connections (for which RPCs go
+        // through serialization)
+        final AkkaRpcService serverAkkaRpcService =
+                new AkkaRpcService(
+                        AkkaUtils.createActorSystem(
+                                "serverActorSystem",
+                                AkkaUtils.getAkkaConfig(
+                                        new Configuration(), new HostAndPort("localhost", 0))),
+                        AkkaRpcServiceConfiguration.defaultConfiguration());
+
+        final AkkaRpcService clientAkkaRpcService =
+                new AkkaRpcService(
+                        AkkaUtils.createActorSystem(
+                                "clientActorSystem",
+                                AkkaUtils.getAkkaConfig(
+                                        new Configuration(), new HostAndPort("localhost", 0))),
+                        AkkaRpcServiceConfiguration.defaultConfiguration(),
+                        pretendFlinkClassLoader);
+
+        try {
+            final TestEndpoint rpcEndpoint =
+                    new TestEndpoint(serverAkkaRpcService, new PickyObject());
+            rpcEndpoint.start();
+
+            final TestEndpointGateway rpcGateway =
+                    rpcEndpoint.getSelfGateway(TestEndpointGateway.class);
+
+            final TestEndpointGateway connect =
+                    clientAkkaRpcService
+                            .connect(rpcGateway.getAddress(), TestEndpointGateway.class)
+                            .get();
+
+            // if the wrong classloader is used the deserialization fails and get() throws an
+            // exception
+            connect.getPickyObject().get();
+        } finally {
+            RpcUtils.terminateRpcService(clientAkkaRpcService, TIMEOUT);
+            RpcUtils.terminateRpcService(serverAkkaRpcService, TIMEOUT);
+        }
+    }
+
+    @Test
     public void testSupervisorActor_TerminationFutureCompletedWithFlinkContextClassLoader()
             throws Exception {
         final TestEndpoint testEndpoint = new TestEndpoint(akkaRpcService);
@@ -315,6 +369,18 @@ public class ContextClassLoadingSettingTest extends TestLogger {
         CompletableFuture<ClassLoader> doRunAsync();
 
         void doSomethingWithoutReturningAnything();
+
+        CompletableFuture<PickyObject> getPickyObject();
+    }
+
+    /** An object that only allows deserialiation if its favorite ContextClassLoader is doing it. */
+    private static class PickyObject implements Serializable {
+        static Consumer<ClassLoader> classLoaderAssertion = null;
+
+        private void readObject(ObjectInputStream aInputStream)
+                throws ClassNotFoundException, IOException {
+            classLoaderAssertion.accept(Thread.currentThread().getContextClassLoader());
+        }
     }
 
     private static class TestEndpoint extends RpcEndpoint implements TestEndpointGateway {
@@ -325,8 +391,15 @@ public class ContextClassLoadingSettingTest extends TestLogger {
                 new CompletableFuture<>();
         private final CompletableFuture<Void> rpcResponseFuture = new CompletableFuture<>();
 
+        @Nullable private final PickyObject pickyObject;
+
         protected TestEndpoint(RpcService rpcService) {
+            this(rpcService, null);
+        }
+
+        protected TestEndpoint(RpcService rpcService, @Nullable PickyObject pickyObject) {
             super(rpcService);
+            this.pickyObject = pickyObject;
         }
 
         @Override
@@ -368,6 +441,11 @@ public class ContextClassLoadingSettingTest extends TestLogger {
             voidOperationClassLoader.complete(Thread.currentThread().getContextClassLoader());
         }
 
+        @Override
+        public CompletableFuture<PickyObject> getPickyObject() {
+            return CompletableFuture.completedFuture(pickyObject);
+        }
+
         public void completeRPCFuture() {
             rpcResponseFuture.complete(null);
         }

[flink] 03/05: [FLINK-24706][rpc] Forward deserialization errors to returned future

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 4651be9011ff6661d4de9347268a80c8317f11d9
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Oct 29 15:34:53 2021 +0200

    [FLINK-24706][rpc] Forward deserialization errors to returned future
---
 .../runtime/rpc/akka/AkkaInvocationHandler.java    | 13 ++--
 .../flink/runtime/rpc/akka/AkkaRpcActorTest.java   | 76 ++++++++++++++++++++++
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
index b4fd6ab..db73771 100644
--- a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
+++ b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaInvocationHandler.java
@@ -237,7 +237,10 @@ class AkkaInvocationHandler implements InvocationHandler, AkkaBasedEndpoint, Rpc
             final Throwable callStackCapture = captureAskCallStack ? new Throwable() : null;
 
             // execute an asynchronous call
-            final CompletableFuture<?> resultFuture = ask(rpcInvocation, futureTimeout);
+            final CompletableFuture<?> resultFuture =
+                    ask(rpcInvocation, futureTimeout)
+                            .thenApply(
+                                    resultValue -> deserializeValueIfNeeded(resultValue, method));
 
             final CompletableFuture<Object> completableFuture = new CompletableFuture<>();
             resultFuture.whenComplete(
@@ -245,10 +248,12 @@ class AkkaInvocationHandler implements InvocationHandler, AkkaBasedEndpoint, Rpc
                         if (failure != null) {
                             completableFuture.completeExceptionally(
                                     resolveTimeoutException(
-                                            failure, callStackCapture, address, rpcInvocation));
+                                            ExceptionUtils.stripCompletionException(failure),
+                                            callStackCapture,
+                                            address,
+                                            rpcInvocation));
                         } else {
-                            completableFuture.complete(
-                                    deserializeValueIfNeeded(resultValue, method));
+                            completableFuture.complete(resultValue);
                         }
                     });
 
diff --git a/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java b/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java
index e99b571..29f973e 100644
--- a/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java
+++ b/flink-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java
@@ -32,6 +32,7 @@ import org.apache.flink.runtime.rpc.RpcUtils;
 import org.apache.flink.runtime.rpc.akka.exceptions.AkkaRpcException;
 import org.apache.flink.runtime.rpc.exceptions.RecipientUnreachableException;
 import org.apache.flink.runtime.rpc.exceptions.RpcConnectionException;
+import org.apache.flink.runtime.rpc.exceptions.RpcException;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.FlinkRuntimeException;
@@ -53,6 +54,8 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Nullable;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
 import java.io.UncheckedIOException;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
@@ -237,6 +240,53 @@ public class AkkaRpcActorTest extends TestLogger {
         }
     }
 
+    /**
+     * Tests that the AkkaInvocationHandler properly fails the returned future if the response
+     * cannot be deserialized.
+     */
+    @Test
+    public void testResultFutureFailsOnDeserializationError() throws Exception {
+        // setup 2 actor systems and rpc services that support remote connections (for which RPCs go
+        // through serialization)
+        final AkkaRpcService serverAkkaRpcService =
+                new AkkaRpcService(
+                        AkkaUtils.createActorSystem(
+                                "serverActorSystem",
+                                AkkaUtils.getAkkaConfig(
+                                        new Configuration(), new HostAndPort("localhost", 0))),
+                        AkkaRpcServiceConfiguration.defaultConfiguration());
+
+        final AkkaRpcService clientAkkaRpcService =
+                new AkkaRpcService(
+                        AkkaUtils.createActorSystem(
+                                "clientActorSystem",
+                                AkkaUtils.getAkkaConfig(
+                                        new Configuration(), new HostAndPort("localhost", 0))),
+                        AkkaRpcServiceConfiguration.defaultConfiguration());
+
+        try {
+            final DeserializatonFailingEndpoint rpcEndpoint =
+                    new DeserializatonFailingEndpoint(serverAkkaRpcService);
+            rpcEndpoint.start();
+
+            final DeserializatonFailingGateway rpcGateway =
+                    rpcEndpoint.getSelfGateway(DeserializatonFailingGateway.class);
+
+            final DeserializatonFailingGateway connect =
+                    clientAkkaRpcService
+                            .connect(rpcGateway.getAddress(), DeserializatonFailingGateway.class)
+                            .get();
+
+            assertThat(
+                    connect.doStuff(),
+                    FlinkMatchers.futureWillCompleteExceptionally(
+                            RpcException.class, Duration.ofHours(1)));
+        } finally {
+            RpcUtils.terminateRpcService(clientAkkaRpcService, timeout);
+            RpcUtils.terminateRpcService(serverAkkaRpcService, timeout);
+        }
+    }
+
     /** Tests that exception thrown in the onStop method are returned by the termination future. */
     @Test
     public void testOnStopExceptionPropagation() throws Exception {
@@ -748,6 +798,32 @@ public class AkkaRpcActorTest extends TestLogger {
 
     // ------------------------------------------------------------------------
 
+    private interface DeserializatonFailingGateway extends RpcGateway {
+        CompletableFuture<DeserializationFailingObject> doStuff();
+    }
+
+    private static class DeserializatonFailingEndpoint extends RpcEndpoint
+            implements DeserializatonFailingGateway {
+
+        protected DeserializatonFailingEndpoint(RpcService rpcService) {
+            super(rpcService);
+        }
+
+        @Override
+        public CompletableFuture<DeserializationFailingObject> doStuff() {
+            return CompletableFuture.completedFuture(new DeserializationFailingObject());
+        }
+    }
+
+    private static class DeserializationFailingObject implements Serializable {
+        private void readObject(ObjectInputStream aInputStream)
+                throws ClassNotFoundException, IOException {
+            throw new ClassNotFoundException("test exception");
+        }
+    }
+
+    // ------------------------------------------------------------------------
+
     private static class SimpleRpcEndpoint extends RpcEndpoint implements RpcGateway {
 
         protected SimpleRpcEndpoint(RpcService rpcService, String endpointId) {

[flink] 01/05: [FLINK-24706][tests] Increase restart delay to 5 seconds

Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 234ba71b3315f6d2ea77b315d49d59f874bd7d0a
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 2 15:19:47 2021 +0100

    [FLINK-24706][tests] Increase restart delay to 5 seconds
---
 .../test/recovery/TaskManagerProcessFailureBatchRecoveryITCase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerProcessFailureBatchRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerProcessFailureBatchRecoveryITCase.java
index 5bbd3fb..aca91ea 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerProcessFailureBatchRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerProcessFailureBatchRecoveryITCase.java
@@ -67,7 +67,7 @@ public class TaskManagerProcessFailureBatchRecoveryITCase
         ExecutionEnvironment env =
                 ExecutionEnvironment.createRemoteEnvironment("localhost", 1337, configuration);
         env.setParallelism(PARALLELISM);
-        env.setRestartStrategy(RestartStrategies.fixedDelayRestart(1, 1500L));
+        env.setRestartStrategy(RestartStrategies.fixedDelayRestart(1, 5000L));
         env.getConfig().setExecutionMode(executionMode);
 
         final long numElements = 100000L;