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

chesnay 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 6902915  [FLINK-13169][tests][coordination] Test TaskExecutor failures 
in fine-grained recovery IT case
6902915 is described below

commit 6902915509323e28611af050f59911964daa3d8f
Author: azagrebin <[email protected]>
AuthorDate: Wed Jul 24 13:07:11 2019 +0200

    [FLINK-13169][tests][coordination] Test TaskExecutor failures in 
fine-grained recovery IT case
    
    The BatchFineGrainedRecoveryITCase can be extended with an additional test 
failure strategy which abruptly shuts down the task executor. This leads to the 
loss of all previously completed and the in-progress mapper result partitions. 
The fail-over strategy should restart the current in-progress mapper which will 
get the PartitionNotFoundException because the previous result becomes 
unavailable and the previous mapper has to be restarted as well. The same 
should happen subsequently wit [...]
---
 .../recovery/BatchFineGrainedRecoveryITCase.java   | 394 ++++++++++++++++-----
 1 file changed, 307 insertions(+), 87 deletions(-)

diff --git 
a/flink-tests/src/test/java/org/apache/flink/test/recovery/BatchFineGrainedRecoveryITCase.java
 
b/flink-tests/src/test/java/org/apache/flink/test/recovery/BatchFineGrainedRecoveryITCase.java
index 9c66293..1549864 100644
--- 
a/flink-tests/src/test/java/org/apache/flink/test/recovery/BatchFineGrainedRecoveryITCase.java
+++ 
b/flink-tests/src/test/java/org/apache/flink/test/recovery/BatchFineGrainedRecoveryITCase.java
@@ -26,24 +26,36 @@ import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.JobManagerOptions;
+import 
org.apache.flink.runtime.io.network.partition.PartitionNotFoundException;
+import org.apache.flink.runtime.minicluster.RpcServiceSharing;
 import org.apache.flink.runtime.minicluster.TestingMiniCluster;
 import 
org.apache.flink.runtime.minicluster.TestingMiniClusterConfiguration.Builder;
 import org.apache.flink.test.util.TestEnvironment;
 import org.apache.flink.util.Collector;
-import org.apache.flink.util.FlinkRuntimeException;
+import org.apache.flink.util.ExceptionUtils;
+import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.concurrent.GuardedBy;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
 import static 
org.apache.flink.configuration.JobManagerOptions.FORCE_PARTITION_RELEASE_ON_CONSUMPTION;
@@ -59,19 +71,66 @@ import static org.junit.Assert.assertThat;
  * the next mapper starts when the previous is done. The mappers are not 
chained into one task which makes them
  * separate fail-over regions.
  *
- * <p>The test verifies that fine-grained recovery works by randomly incuding 
failures in any of the mappers.
- * Since all mappers are connected via blocking partitions, which should be 
re-used on failure, and the consumer
- * of the mapper wasn't deployed yet, as the consumed partition was not fully 
produced yet, only the failed mapper
- * should actually restart.
+ * <p>The test verifies the fine-grained recovery by including one failure 
after a random record for each failure
+ * strategy in all mappers and comparing expected number of each mapper 
restarts against the actual restarts.
+ * There are multiple failure strategies:
+ *
+ * <ul>
+ *   <li> The {@link ExceptionFailureStrategy} throws an exception in the user 
function code.
+ *   Since all mappers are connected via blocking partitions, which should be 
re-used on failure, and the consumer
+ *   of the mapper wasn't deployed yet, as the consumed partition was not 
fully produced yet, only the failed mapper
+ *   should actually restart.
+ *   <li> The {@link TaskExecutorFailureStrategy} abruptly shuts down the task 
executor. This leads to the loss
+ *   of all previously completed and the in-progress mapper result partitions. 
The fail-over strategy should restart
+ *   the current in-progress mapper which will get the {@link 
PartitionNotFoundException} because the previous result
+ *   becomes unavailable and the previous mapper has to be restarted as well. 
The same should happen subsequently with
+ *   all previous mappers. When the source is recomputed, all mappers has to 
be restarted again to recalculate their
+ *   lost results.
+ * </ul>
  */
 public class BatchFineGrainedRecoveryITCase extends TestLogger {
+       private static final Logger LOG = 
LoggerFactory.getLogger(BatchFineGrainedRecoveryITCase.class);
+
        private static final int EMITTED_RECORD_NUMBER = 1000;
-       private static final int MAX_FAILURE_NUMBER = 10;
        private static final int MAP_NUMBER = 3;
+
+       /**
+        * Number of job failures for all mappers due to backtracking when the 
produced partitions get lost.
+        *
+        * <p>Each mapper failure produces number of backtracking failures 
(partition not found) which is the mapper index + 1,
+        * because all previous producers have to be restarted and they firstly 
will not find the previous result.
+        */
+       private static final int ALL_MAPPERS_BACKTRACK_FAILURES = 
IntStream.range(0, MAP_NUMBER + 1).sum();
+
+       /**
+        * Max number of job failures.
+        *
+        * <p>For each possible mapper failure, it is all possible backtracking 
failures plus the generated failures themselves of each type.
+        */
+       private static final int MAX_JOB_RESTART_ATTEMPTS = 
ALL_MAPPERS_BACKTRACK_FAILURES + 2 * MAP_NUMBER;
+
+       /**
+        * Expected restart number for each mapper.
+        *
+        * <p>Initial start plus exception failure plus restarts from this and 
each subsequent mapper's TM failure.
+        */
+       private static final int[] EXPECTED_MAP_RESTARTS = IntStream
+               .range(0, MAP_NUMBER)
+               .map(i -> 1 + 1 + MAP_NUMBER - i)
+               .toArray();
+
+       private static final String TASK_NAME_PREFIX = "Test partition mapper ";
+
        private static final List<Long> EXPECTED_JOB_OUTPUT =
                LongStream.range(MAP_NUMBER, EMITTED_RECORD_NUMBER + 
MAP_NUMBER).boxed().collect(Collectors.toList());
 
-       private TestingMiniCluster miniCluster;
+       private static TestingMiniCluster miniCluster;
+
+       private static AtomicInteger lastTaskManagerIndexInMiniCluster;
+
+       private static final Random rnd = new Random();
+
+       private static GlobalMapFailureTracker failureTracker;
 
        @Before
        public void setup() throws Exception {
@@ -81,13 +140,17 @@ public class BatchFineGrainedRecoveryITCase extends 
TestLogger {
 
                miniCluster = new TestingMiniCluster(
                        new Builder()
-                               .setNumTaskManagers(MAP_NUMBER)
+                               .setNumTaskManagers(1)
                                .setNumSlotsPerTaskManager(1)
                                .setConfiguration(configuration)
+                               
.setRpcServiceSharing(RpcServiceSharing.DEDICATED)
                                .build(),
                        null);
-
                miniCluster.start();
+
+               lastTaskManagerIndexInMiniCluster = new AtomicInteger(0);
+
+               failureTracker = new GlobalMapFailureTracker(MAP_NUMBER);
        }
 
        @After
@@ -101,101 +164,275 @@ public class BatchFineGrainedRecoveryITCase extends 
TestLogger {
        public void testProgram() throws Exception {
                ExecutionEnvironment env = createExecutionEnvironment();
 
-               StaticFailureCounter.reset();
-               StaticMapFailureTracker.reset();
-
-               FailureStrategy failureStrategy = new 
RandomExceptionFailureStrategy(1, EMITTED_RECORD_NUMBER);
-
                DataSet<Long> input = env.generateSequence(0, 
EMITTED_RECORD_NUMBER - 1);
-               for (int i = 0; i < MAP_NUMBER; i++) {
+               for (int trackingIndex = 0; trackingIndex < MAP_NUMBER; 
trackingIndex++) {
                        input = input
-                               .mapPartition(new 
TestPartitionMapper(StaticMapFailureTracker.addNewMap(), failureStrategy))
-                               .name("Test partition mapper " + i);
+                               .mapPartition(new 
TestPartitionMapper(trackingIndex,  createFailureStrategy(trackingIndex)))
+                               .name(TASK_NAME_PREFIX + trackingIndex);
                }
+
                assertThat(input.collect(), is(EXPECTED_JOB_OUTPUT));
+               failureTracker.verify();
+       }
 
-               StaticMapFailureTracker.verify();
+       private static FailureStrategy createFailureStrategy(int trackingIndex) 
{
+               int failWithExceptionAfterNumberOfProcessedRecords = 
rnd.nextInt(EMITTED_RECORD_NUMBER) + 1;
+               int failTaskExecutorAfterNumberOfProcessedRecords = 
rnd.nextInt(EMITTED_RECORD_NUMBER) + 1;
+               // it has to fail only once during one mapper run so that 
different failure strategies do not mess up each other stats
+               FailureStrategy failureStrategy = new OneTimeFailureStrategy(
+                       new JoinedFailureStrategy(
+                               new GloballyTrackingFailureStrategy(
+                                       new 
ExceptionFailureStrategy(failWithExceptionAfterNumberOfProcessedRecords)),
+                               new GloballyTrackingFailureStrategy(
+                                       new 
TaskExecutorFailureStrategy(failTaskExecutorAfterNumberOfProcessedRecords))));
+               LOG.info("FailureStrategy for the mapper {}: {}", 
trackingIndex, failureStrategy);
+               return failureStrategy;
        }
 
-       private ExecutionEnvironment createExecutionEnvironment() {
+       private static ExecutionEnvironment createExecutionEnvironment() {
                @SuppressWarnings("StaticVariableUsedBeforeInitialization")
                ExecutionEnvironment env = new TestEnvironment(miniCluster, 1, 
true);
-               
env.setRestartStrategy(RestartStrategies.fixedDelayRestart(MAX_FAILURE_NUMBER, 
Time.milliseconds(10)));
+               
env.setRestartStrategy(RestartStrategies.fixedDelayRestart(MAX_JOB_RESTART_ATTEMPTS,
 Time.milliseconds(10)));
                env.getConfig().setExecutionMode(ExecutionMode.BATCH_FORCED); 
// forces all partitions to be blocking
                return env;
        }
 
-       private enum StaticMapFailureTracker {
-               ;
+       @SuppressWarnings({"StaticVariableUsedBeforeInitialization", 
"OverlyBroadThrowsClause"})
+       private static void restartTaskManager() throws Exception {
+               int tmi = lastTaskManagerIndexInMiniCluster.getAndIncrement();
+               try {
+                       miniCluster.terminateTaskExecutor(tmi).get();
+               } finally {
+                       miniCluster.startTaskExecutor();
+               }
+       }
 
-               private static final List<AtomicInteger> mapRestarts = new 
ArrayList<>(10);
-               private static final List<AtomicInteger> expectedMapRestarts = 
new ArrayList<>(10);
+       @FunctionalInterface
+       private interface FailureStrategy extends Serializable {
+               /**
+                * Decides whether to fail and fails the task implicitly or by 
throwing an exception.
+                *
+                * @param trackingIndex index of the mapper task in the sequence
+                * @return {@code true} if task is failed implicitly or {@code 
false} if task is not failed
+                * @throws Exception To fail the task explicitly
+                */
+               boolean failOrNot(int trackingIndex) throws Exception;
+       }
 
-               private static void reset() {
-                       mapRestarts.clear();
-                       expectedMapRestarts.clear();
+       private static class OneTimeFailureStrategy implements FailureStrategy {
+               private static final long serialVersionUID = 1L;
+
+               private final FailureStrategy wrappedFailureStrategy;
+               private transient boolean failed;
+
+               private OneTimeFailureStrategy(FailureStrategy 
wrappedFailureStrategy) {
+                       this.wrappedFailureStrategy = wrappedFailureStrategy;
                }
 
-               private static int addNewMap() {
-                       mapRestarts.add(new AtomicInteger(0));
-                       expectedMapRestarts.add(new AtomicInteger(1));
-                       return mapRestarts.size() - 1;
+               @Override
+               public boolean failOrNot(int trackingIndex) throws Exception {
+                       if (!failed) {
+                               try {
+                                       boolean failedNow = 
wrappedFailureStrategy.failOrNot(trackingIndex);
+                                       failed = failedNow;
+                                       return failedNow;
+                               } catch (Exception e) {
+                                       failed = true;
+                                       throw e;
+                               }
+                       }
+                       return false;
                }
 
-               private static void mapRestart(int index) {
-                       mapRestarts.get(index).incrementAndGet();
+               @Override
+               public String toString() {
+                       return "FailingOnce{" + wrappedFailureStrategy + '}';
                }
+       }
 
-               private static void mapFailure(int index) {
-                       expectedMapRestarts.get(index).incrementAndGet();
+       private static class JoinedFailureStrategy implements FailureStrategy {
+               private static final long serialVersionUID = 1L;
+
+               private final FailureStrategy[] failureStrategies;
+
+               private JoinedFailureStrategy(FailureStrategy ... 
failureStrategies) {
+                       this.failureStrategies = failureStrategies;
                }
 
-               private static void verify() {
-                       assertThat(collect(mapRestarts), 
is(collect(expectedMapRestarts)));
+               @Override
+               public boolean failOrNot(int trackingIndex) throws Exception {
+                       for (FailureStrategy failureStrategy : 
failureStrategies) {
+                               if (failureStrategy.failOrNot(trackingIndex)) {
+                                       return true;
+                               }
+                       }
+                       return false;
                }
 
-               private static int[] collect(Collection<AtomicInteger> list) {
-                       return 
list.stream().mapToInt(AtomicInteger::get).toArray();
+               @Override
+               public String toString() {
+                       return String.join(
+                               " or ",
+                               (Iterable<String>) () -> 
Arrays.stream(failureStrategies).map(Object::toString).iterator());
                }
        }
 
-       @FunctionalInterface
-       private interface FailureStrategy extends Serializable {
-               void failOrNot();
+       private static class GloballyTrackingFailureStrategy implements 
FailureStrategy {
+               private static final long serialVersionUID = 1L;
+
+               private final FailureStrategy wrappedFailureStrategy;
+
+               private GloballyTrackingFailureStrategy(FailureStrategy 
wrappedFailureStrategy) {
+                       this.wrappedFailureStrategy = wrappedFailureStrategy;
+               }
+
+               @Override
+               public boolean failOrNot(int trackingIndex) throws Exception {
+                       return failureTracker.failOrNot(
+                               trackingIndex,
+                               wrappedFailureStrategy);
+               }
+
+               @Override
+               public String toString() {
+                       return "Tracked{" + wrappedFailureStrategy + '}';
+               }
        }
 
-       private static class RandomExceptionFailureStrategy implements 
FailureStrategy {
+       private static class ExceptionFailureStrategy extends 
AbstractOnceAfterCallNumberFailureStrategy {
                private static final long serialVersionUID = 1L;
 
-               private final CoinToss coin;
+               private ExceptionFailureStrategy(int failAfterCallNumber) {
+                       super(failAfterCallNumber);
+               }
+
+               @Override
+               void fail(int trackingIndex) throws FlinkException {
+                       throw new FlinkException("BAGA-BOOM!!! The user 
function generated test failure.");
+               }
+       }
+
+       private static class TaskExecutorFailureStrategy extends 
AbstractOnceAfterCallNumberFailureStrategy {
+               private static final long serialVersionUID = 1L;
 
-               private RandomExceptionFailureStrategy(int probFraction, int 
probBase) {
-                       this.coin = new CoinToss(probFraction, probBase);
+               private TaskExecutorFailureStrategy(int failAfterCallNumber) {
+                       super(failAfterCallNumber);
                }
 
                @Override
-               public void failOrNot() {
-                       if (coin.toss() && StaticFailureCounter.failOrNot()) {
-                               throw new FlinkRuntimeException("BAGA-BOOM!!! 
The user function generated test failure.");
+               void fail(int trackingIndex) throws Exception {
+                       //noinspection OverlyBroadCatchBlock
+                       try {
+                               restartTaskManager();
+                       } catch (InterruptedException e) {
+                               // ignore the exception, task should have been 
failed while stopping TM
+                               Thread.currentThread().interrupt();
+                       } catch (Throwable t) {
+                               failureTracker.unrelatedFailure(t);
+                               throw t;
                        }
                }
        }
 
-       private static class CoinToss implements Serializable {
+       private abstract static class 
AbstractOnceAfterCallNumberFailureStrategy implements FailureStrategy {
                private static final long serialVersionUID = 1L;
-               private static final Random rnd = new Random();
 
-               private final int probFraction;
-               private final int probBase;
+               private final UUID id;
+               private final int failAfterCallNumber;
+               private transient int callCounter;
+
+               private AbstractOnceAfterCallNumberFailureStrategy(int 
failAfterCallNumber) {
+                       this.failAfterCallNumber = failAfterCallNumber;
+                       id = UUID.randomUUID();
+               }
+
+               @Override
+               public boolean failOrNot(int trackingIndex) throws Exception {
+                       callCounter++;
+                       boolean generateFailure = callCounter == 
failAfterCallNumber;
+                       if (generateFailure) {
+                               fail(trackingIndex);
+                       }
+                       return generateFailure;
+               }
+
+               abstract void fail(int trackingIndex) throws Exception;
+
+               @Override
+               public String toString() {
+                       return this.getClass().getSimpleName() + " (fail after 
" + failAfterCallNumber + " calls)";
+               }
+
+               @Override
+               public boolean equals(Object o) {
+                       if (this == o) {
+                               return true;
+                       }
+                       if (o == null || getClass() != o.getClass()) {
+                               return false;
+                       }
+                       return Objects.equals(id, 
((AbstractOnceAfterCallNumberFailureStrategy) o).id);
+               }
+
+               @Override
+               public int hashCode() {
+                       return id.hashCode();
+               }
+       }
+
+       private static class GlobalMapFailureTracker {
+               private final List<AtomicInteger> mapRestarts;
+               private final List<Set<FailureStrategy>> mapFailures;
+
+               private final Object classLock = new Object();
+               @GuardedBy("classLock")
+               private Throwable unexpectedFailure;
+
+               private GlobalMapFailureTracker(int numberOfMappers) {
+                       mapRestarts = new ArrayList<>(numberOfMappers);
+                       mapFailures = new ArrayList<>(numberOfMappers);
+                       IntStream.range(0, numberOfMappers).forEach(i -> 
addNewMapper());
+               }
+
+               private int addNewMapper() {
+                       mapRestarts.add(new AtomicInteger(0));
+                       mapFailures.add(new HashSet<>(2));
+                       return mapRestarts.size() - 1;
+               }
+
+               private boolean failOrNot(int index, FailureStrategy 
failureStrategy) throws Exception {
+                       boolean alreadyFailed = 
mapFailures.get(index).contains(failureStrategy);
+                       boolean failedNow = false;
+                       try {
+                               failedNow = !alreadyFailed && 
failureStrategy.failOrNot(index);
+                       } catch (Exception e) {
+                               failedNow = true;
+                               throw e;
+                       } finally {
+                               if (failedNow) {
+                                       
mapFailures.get(index).add(failureStrategy);
+                               }
+                       }
+                       return failedNow;
+               }
+
+               private void mapRestart(int index) {
+                       mapRestarts.get(index).incrementAndGet();
+               }
 
-               private CoinToss(int probFraction, int probBase) {
-                       this.probFraction = probFraction;
-                       this.probBase = probBase;
+               private void unrelatedFailure(Throwable failure) {
+                       synchronized (classLock) {
+                               unexpectedFailure = 
ExceptionUtils.firstOrSuppressed(failure, unexpectedFailure);
+                       }
                }
 
-               private boolean toss() {
-                       int prob = rnd.nextInt(probBase) + 1;
-                       return prob <= probFraction;
+               private void verify() {
+                       synchronized (classLock) {
+                               if (unexpectedFailure != null) {
+                                       throw new AssertionError("Test failed 
due to unexpected exception.", unexpectedFailure);
+                               }
+                       }
+                       
assertThat(mapRestarts.stream().mapToInt(AtomicInteger::get).toArray(), 
is(EXPECTED_MAP_RESTARTS));
                }
        }
 
@@ -212,39 +449,22 @@ public class BatchFineGrainedRecoveryITCase extends 
TestLogger {
 
                @Override
                public void open(Configuration parameters) throws Exception {
-                       super.open(parameters);
-                       StaticMapFailureTracker.mapRestart(trackingIndex);
-               }
-
-               @Override
-               public void mapPartition(Iterable<Long> values, Collector<Long> 
out) {
-                       values.forEach(value -> {
-                               failOrNot();
-                               out.collect(value + 1);
-                       });
-               }
-
-               private void failOrNot() {
+                       //noinspection OverlyBroadCatchBlock
                        try {
-                               failureStrategy.failOrNot();
+                               super.open(parameters);
+                               failureTracker.mapRestart(trackingIndex);
                        } catch (Throwable t) {
-                               
StaticMapFailureTracker.mapFailure(trackingIndex);
+                               failureTracker.unrelatedFailure(t);
                                throw t;
                        }
                }
-       }
-
-       private enum StaticFailureCounter {
-               ;
 
-               private static final AtomicInteger failureNumber = new 
AtomicInteger(0);
-
-               private static boolean failOrNot() {
-                       return failureNumber.incrementAndGet() < 
MAX_FAILURE_NUMBER;
-               }
-
-               private static void reset() {
-                       failureNumber.set(0);
+               @Override
+               public void mapPartition(Iterable<Long> values, Collector<Long> 
out) throws Exception {
+                       for (Long value : values) {
+                               failureStrategy.failOrNot(trackingIndex);
+                               out.collect(value + 1);
+                       }
                }
        }
 }

Reply via email to