You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ar...@apache.org on 2021/02/10 13:31:46 UTC

[flink] branch master updated: [FLINK-19520][configuration] Add randomization of checkpoint config in ITCases.

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

arvid 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 4fd2cec  [FLINK-19520][configuration] Add randomization of checkpoint config in ITCases.
4fd2cec is described below

commit 4fd2cec5b9390e6f7e26b0a86b5f4886ff7e68e5
Author: Arvid Heise <ar...@ververica.com>
AuthorDate: Mon Feb 1 20:51:24 2021 +0100

    [FLINK-19520][configuration] Add randomization of checkpoint config in ITCases.
---
 flink-runtime/pom.xml                              |  26 ----
 .../flink/runtime/util/EnvironmentInformation.java |   5 +-
 .../java/org/apache/flink/util/TestLogger.java     |   2 +
 .../org/apache/flink/util/TestNameProvider.java    |  52 ++++++++
 .../streaming/util/PseudoRandomValueSelector.java  | 124 ++++++++++++++++++
 .../streaming/util/TestStreamEnvironment.java      |  22 ++++
 .../util/PseudoRandomValueSelectorTest.java        | 139 +++++++++++++++++++++
 pom.xml                                            |  52 +++++---
 8 files changed, 375 insertions(+), 47 deletions(-)

diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 95f7818..d3c1038 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -485,32 +485,6 @@ under the License.
 					<reuseForks>false</reuseForks>
 				</configuration>
 			</plugin>
-			<plugin>
-				<!-- Description: https://github.com/git-commit-id/git-commit-id-maven-plugin
-					Used to show the git ref when starting the jobManager. -->
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
-					<skipPoms>false</skipPoms>
-					<failOnNoGitDirectory>false</failOnNoGitDirectory>
-					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-					<gitDescribe>
-						<!-- Don't generate the describe property -->
-						<!-- It is useless due to the way Flink does branches and tags -->
-						<skip>true</skip>
-					</gitDescribe>
-				</configuration>
-			</plugin>
 			<!-- Add version to jar http://stackoverflow.com/questions/2712970/how-to-get-maven-artifact-version-at-runtime
 				-->
 			<plugin>
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
index 711368f..b4452fd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.runtime.util;
 
+import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.configuration.GlobalConfiguration;
 import org.apache.flink.util.OperatingSystem;
 
@@ -41,6 +42,8 @@ import java.util.Properties;
  * startup options, or the JVM version.
  */
 public class EnvironmentInformation {
+    @VisibleForTesting public static final String UNKNOWN_COMMIT_ID = "DecafC0ffeeD0d0F00d";
+    @VisibleForTesting public static final String UNKNOWN_COMMIT_ID_ABBREV = "DeadD0d0";
 
     private static final Logger LOG = LoggerFactory.getLogger(EnvironmentInformation.class);
 
@@ -113,8 +116,6 @@ public class EnvironmentInformation {
     private static final class Versions {
         private static final Instant DEFAULT_TIME_INSTANT = Instant.EPOCH;
         private static final String DEFAULT_TIME_STRING = "1970-01-01T00:00:00+0000";
-        private static final String UNKNOWN_COMMIT_ID = "DecafC0ffeeD0d0F00d";
-        private static final String UNKNOWN_COMMIT_ID_ABBREV = "DeadD0d0";
         private String projectVersion = UNKNOWN;
         private String scalaVersion = UNKNOWN;
         private Instant gitBuildTime = DEFAULT_TIME_INSTANT;
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestLogger.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestLogger.java
index 7f9b9ec..c72e436 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestLogger.java
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestLogger.java
@@ -72,6 +72,8 @@ public class TestLogger {
                 }
             };
 
+    @Rule public final TestRule nameProvider = new TestNameProvider();
+
     private static String exceptionToString(Throwable t) {
         if (t == null) {
             return "(null)";
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProvider.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProvider.java
new file mode 100644
index 0000000..2c91ef0
--- /dev/null
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProvider.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.util;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import javax.annotation.Nullable;
+
+/**
+ * A rule that provides the current test name per thread. Currently, the test name is available for
+ * all tests that extend {@link TestLogger}.
+ */
+public class TestNameProvider implements TestRule {
+    private static ThreadLocal<String> testName = new ThreadLocal<>();
+
+    @Nullable
+    public static String getCurrentTestName() {
+        return testName.get();
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                testName.set(description.getDisplayName());
+                try {
+                    base.evaluate();
+                } finally {
+                    testName.set(null);
+                }
+            }
+        };
+    }
+}
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
new file mode 100644
index 0000000..625f713
--- /dev/null
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.util;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.configuration.ConfigOption;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.runtime.util.EnvironmentInformation;
+
+import net.jcip.annotations.NotThreadSafe;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Function;
+
+/**
+ * Initializes the {@link Configuration} for particular {@link ConfigOption}s with random values if
+ * unset.
+ *
+ * <p>With the same seed, the same values are always selected if the {@link #select(Configuration,
+ * ConfigOption, Object[])} invocation happens in the same order. A different seed should select
+ * different values.
+ *
+ * <p>The seed is calculated from a global seed (~unique per build) and a seed specific to test
+ * cases. Thus, two different builds will mostly result in different values for the same test case.
+ * Similarly, two test cases in the same build will have different randomized values.
+ *
+ * <p>The seed can be set with the maven/system property test.randomization.seed and is set by
+ * default to commit id. If the seed is empty, {@link EnvironmentInformation} and as a last fallback
+ * git command is used to retrieve the commit id.
+ */
+@Internal
+@NotThreadSafe
+class PseudoRandomValueSelector {
+    private static final Logger LOG = LoggerFactory.getLogger(PseudoRandomValueSelector.class);
+
+    private final Function<Integer, Integer> randomValueSupplier;
+
+    private static final long GLOBAL_SEED = (long) getGlobalSeed().hashCode() << 32;
+
+    private PseudoRandomValueSelector(Function<Integer, Integer> randomValueSupplier) {
+        this.randomValueSupplier = randomValueSupplier;
+    }
+
+    public <T> void select(Configuration configuration, ConfigOption<T> option, T... alternatives) {
+        if (configuration.contains(option)) {
+            return;
+        }
+        final int choice = randomValueSupplier.apply(alternatives.length);
+        T value = alternatives[choice];
+        LOG.info("Randomly selected {} for {}", value, option.key());
+        configuration.set(option, value);
+    }
+
+    public static PseudoRandomValueSelector create(Object entryPointSeed) {
+        final long combinedSeed = GLOBAL_SEED | entryPointSeed.hashCode();
+        final Random random = new Random(combinedSeed);
+        return new PseudoRandomValueSelector(random::nextInt);
+    }
+
+    private static String getGlobalSeed() {
+        // manual seed or set by maven
+        final String seed = System.getProperty("test.randomization.seed");
+        if (seed != null) {
+            return seed;
+        }
+
+        // Read with git command (if installed)
+        final Optional<String> gitCommitId = getGitCommitId();
+        if (gitCommitId.isPresent()) {
+            return gitCommitId.get();
+        }
+
+        // try EnvironmentInformation, which is set in the maven process
+        final String commitId = EnvironmentInformation.getGitCommitId();
+        if (!commitId.equals(EnvironmentInformation.UNKNOWN_COMMIT_ID)) {
+            return commitId;
+        }
+
+        LOG.warn(
+                "Test randomization was enabled but neither test.randomization.seed was configured nor could the commit hash be retrieved from git or the EnvironmentInformation. Please set the test.randomization.seed property manually to make the build reproducible.");
+        // return any constant
+        return "";
+    }
+
+    @VisibleForTesting
+    static Optional<String> getGitCommitId() {
+        try {
+            Process process = new ProcessBuilder("git", "rev-parse", "HEAD").start();
+            try (InputStream input = process.getInputStream()) {
+                final String commit = IOUtils.toString(input, Charset.defaultCharset()).trim();
+                if (commit.matches("[a-f0-9]{40}")) {
+                    return Optional.of(commit);
+                }
+                LOG.debug("Cannot parse {}", commit);
+            }
+        } catch (IOException e) {
+            LOG.debug("Could not invoke git", e);
+        }
+        return Optional.empty();
+    }
+}
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 c2120ac..d63a38d 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
@@ -18,11 +18,14 @@
 
 package org.apache.flink.streaming.util;
 
+import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.fs.Path;
 import org.apache.flink.runtime.minicluster.MiniCluster;
+import org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironmentFactory;
 import org.apache.flink.test.util.MiniClusterPipelineExecutorServiceLoader;
+import org.apache.flink.util.TestNameProvider;
 
 import java.net.URL;
 import java.util.Collection;
@@ -30,6 +33,8 @@ import java.util.Collections;
 
 /** A {@link StreamExecutionEnvironment} that executes its jobs on {@link MiniCluster}. */
 public class TestStreamEnvironment extends StreamExecutionEnvironment {
+    private static final boolean RANDOMIZE_CHECKPOINTING_CONFIG =
+            Boolean.parseBoolean(System.getProperty("checkpointing.randomization", "false"));
 
     public TestStreamEnvironment(
             MiniCluster miniCluster,
@@ -69,6 +74,7 @@ public class TestStreamEnvironment extends StreamExecutionEnvironment {
                     TestStreamEnvironment env =
                             new TestStreamEnvironment(
                                     miniCluster, parallelism, jarFiles, classpaths);
+                    randomize(conf);
                     env.configure(conf, env.getUserClassloader());
                     return env;
                 };
@@ -77,6 +83,22 @@ public class TestStreamEnvironment extends StreamExecutionEnvironment {
     }
 
     /**
+     * Randomizes configuration on test case level even if mini cluster is used in a class rule.
+     *
+     * <p>Note that only unset properties are randomized.
+     *
+     * @param conf the configuration to randomize
+     */
+    private static void randomize(Configuration conf) {
+        if (RANDOMIZE_CHECKPOINTING_CONFIG) {
+            final String testName = TestNameProvider.getCurrentTestName();
+            final PseudoRandomValueSelector valueSelector =
+                    PseudoRandomValueSelector.create(testName != null ? testName : "unknown");
+            valueSelector.select(conf, ExecutionCheckpointingOptions.ENABLE_UNALIGNED, true, false);
+        }
+    }
+
+    /**
      * Sets the streaming context environment to a TestStreamEnvironment that runs its programs on
      * the given cluster with the given default parallelism.
      *
diff --git a/flink-test-utils-parent/flink-test-utils/src/test/java/org/apache/flink/streaming/util/PseudoRandomValueSelectorTest.java b/flink-test-utils-parent/flink-test-utils/src/test/java/org/apache/flink/streaming/util/PseudoRandomValueSelectorTest.java
new file mode 100644
index 0000000..515372d
--- /dev/null
+++ b/flink-test-utils-parent/flink-test-utils/src/test/java/org/apache/flink/streaming/util/PseudoRandomValueSelectorTest.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.util;
+
+import org.apache.flink.api.java.tuple.Tuple3;
+import org.apache.flink.configuration.ConfigOption;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.runtime.testutils.ZooKeeperTestUtils;
+import org.apache.flink.runtime.util.EnvironmentInformation;
+import org.apache.flink.util.TestLogger;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import static org.apache.flink.configuration.CheckpointingOptions.SAVEPOINT_DIRECTORY;
+import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.CHECKPOINTING_INTERVAL;
+import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.TOLERABLE_FAILURE_NUMBER;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeNoException;
+import static org.junit.Assume.assumeNotNull;
+
+/** Tests {@link PseudoRandomValueSelector}. */
+public class PseudoRandomValueSelectorTest extends TestLogger {
+
+    /**
+     * Tests that the selector will return different values if invoked several times even for the
+     * same option.
+     */
+    @Test
+    public void testRandomizationOfValues() {
+        final Duration[] alternatives =
+                IntStream.range(0, 1000).boxed().map(Duration::ofMillis).toArray(Duration[]::new);
+
+        final PseudoRandomValueSelector valueSelector = PseudoRandomValueSelector.create("seed");
+
+        final Set<Duration> uniqueValues = new HashSet<>(1);
+        for (int i = 0; i < 100; i++) {
+            final Duration selectedValue =
+                    selectValue(valueSelector, CHECKPOINTING_INTERVAL, alternatives);
+            uniqueValues.add(selectedValue);
+        }
+        assertThat(uniqueValues.size(), greaterThan(1));
+    }
+
+    private <T> T selectValue(
+            PseudoRandomValueSelector valueSelector, ConfigOption<T> option, T... alternatives) {
+        final Configuration configuration = new Configuration();
+        assertNull(configuration.get(option));
+        valueSelector.select(configuration, option, alternatives);
+        final T selected = configuration.get(option);
+        assertNotNull(selected);
+        return selected;
+    }
+
+    /** Tests that the selector will return different values for different seeds. */
+    @Test
+    public void testRandomizationWithSeed() {
+        final Duration[] alternatives =
+                IntStream.range(0, 1000).boxed().map(Duration::ofMillis).toArray(Duration[]::new);
+
+        final Set<Duration> uniqueValues = new HashSet<>(1);
+        for (int i = 0; i < 100; i++) {
+            final PseudoRandomValueSelector selector = PseudoRandomValueSelector.create("test" + i);
+            uniqueValues.add(selectValue(selector, CHECKPOINTING_INTERVAL, alternatives));
+        }
+        assertThat(uniqueValues.size(), greaterThan(1));
+    }
+
+    /** Tests that the selector produces the same value for the same seed. */
+    @Test
+    public void testStableRandomization() {
+        final Duration[] intervals =
+                IntStream.range(0, 1000).boxed().map(Duration::ofMillis).toArray(Duration[]::new);
+        final Integer[] numbers = IntStream.range(0, 1000).boxed().toArray(Integer[]::new);
+        final String[] strings =
+                IntStream.range(0, 1000).mapToObj(i -> "string" + i).toArray(String[]::new);
+
+        final Set<Tuple3<Duration, Integer, String>> uniqueValues = new HashSet<>(1);
+        for (int i = 0; i < 100; i++) {
+            final PseudoRandomValueSelector selector = PseudoRandomValueSelector.create("test");
+            uniqueValues.add(
+                    new Tuple3<>(
+                            selectValue(selector, CHECKPOINTING_INTERVAL, intervals),
+                            selectValue(selector, TOLERABLE_FAILURE_NUMBER, numbers),
+                            selectValue(selector, SAVEPOINT_DIRECTORY, strings)));
+        }
+        assertEquals(1, uniqueValues.size());
+    }
+
+    /**
+     * Tests that reading through git command yields the same as {@link EnvironmentInformation}.
+     *
+     * <p>This test assumes that both sources of information are available (CI).
+     */
+    @Test
+    public void readCommitId() {
+        assumeNotNull(ZooKeeperTestUtils.runsOnCIInfrastructure());
+        // this information is only valid after executing process-resources on flink-runtime
+        final String envCommitId = EnvironmentInformation.getGitCommitId();
+        assumeFalse(envCommitId.equals(EnvironmentInformation.UNKNOWN_COMMIT_ID));
+        // test if git is available
+        try {
+            new ProcessBuilder("git", "version").start();
+        } catch (IOException e) {
+            assumeNoException(e);
+        }
+
+        final Optional<String> gitCommitId = PseudoRandomValueSelector.getGitCommitId();
+        assertTrue(gitCommitId.isPresent());
+        assertEquals(envCommitId, gitCommitId.get());
+    }
+}
diff --git a/pom.xml b/pom.xml
index 0b23135..ffd128f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,9 @@ under the License.
 		<japicmp.referenceVersion>1.12.0</japicmp.referenceVersion>
 		<japicmp.outputDir>tools/japicmp-output</japicmp.outputDir>
 		<spotless.version>2.4.2</spotless.version>
+
+		<!-- Can be set to any value to reproduce a specific build. -->
+		<test.randomization.seed>${git.commit.id}</test.randomization.seed>
 	</properties>
 
 	<dependencies>
@@ -1354,6 +1357,33 @@ under the License.
 			</plugin>
 
 			<plugin>
+				<!-- Description: https://github.com/git-commit-id/git-commit-id-maven-plugin
+					Used to show the git ref when starting the jobManager. -->
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>4.0.2</version>
+				<executions>
+					<execution>
+						<id>get-the-git-infos</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<skipPoms>false</skipPoms>
+					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+					<gitDescribe>
+						<!-- Don't generate the describe property -->
+						<!-- It is useless due to the way Flink does branches and tags -->
+						<skip>true</skip>
+					</gitDescribe>
+				</configuration>
+			</plugin>
+
+			<plugin>
 				<groupId>org.apache.rat</groupId>
 				<artifactId>apache-rat-plugin</artifactId>
 				<version>0.12</version><!--$NO-MVN-MAN-VER$-->
@@ -1557,8 +1587,10 @@ under the License.
 					<systemPropertyVariables>
 						<forkNumber>0${surefire.forkNumber}</forkNumber>
 						<hadoop.version>${hadoop.version}</hadoop.version>
-						<execution.checkpointing.unaligned>true</execution.checkpointing.unaligned>
+						<checkpointing.randomization>true</checkpointing.randomization>
 						<project.basedir>${project.basedir}</project.basedir>
+						<!--suppress MavenModelInspection -->
+						<test.randomization.seed>${test.randomization.seed}</test.randomization.seed>
 					</systemPropertyVariables>
 					<argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber} -XX:+UseG1GC</argLine>
 				</configuration>
@@ -1940,24 +1972,6 @@ under the License.
 				</plugin>
 
 				<plugin>
-					<groupId>pl.project13.maven</groupId>
-					<artifactId>git-commit-id-plugin</artifactId>
-					<version>4.0.0</version>
-					<configuration>
-						<excludeProperties>
-							<excludeProperty>git.build.user.*</excludeProperty>
-							<excludeProperty>git.commit.user.*</excludeProperty>
-							<excludeProperty>git.branch.*</excludeProperty>
-							<excludeProperty>git.remote.*</excludeProperty>
-						</excludeProperties>
-
-						<!-- This is the same as the default date time format of this plugin.      -->
-						<!-- Because we want to parse the result we are fixing it to avoid problems. -->
-						<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
-					</configuration>
-				</plugin>
-
-				<plugin>
 					<!-- Inherited from Apache parent, but not actually used. Disable to reduce noise. -->
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>