GJL commented on a change in pull request #8912: [FLINK-12709] [runtime] Implement new generation restart strategy loader which also respects legacy… URL: https://github.com/apache/flink/pull/8912#discussion_r322781627
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/failover/flip1/RestartBackoffTimeStrategyFactoryLoaderTest.java ########## @@ -0,0 +1,174 @@ +/* + * 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.runtime.executiongraph.failover.flip1; + +import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.api.common.time.Time; +import org.apache.flink.configuration.ConfigConstants; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.RestartBackoffTimeStrategyOptions; +import org.apache.flink.util.TestLogger; + +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsInstanceOf.instanceOf; + +/** + * Unit tests for {@link RestartBackoffTimeStrategyFactoryLoader}. + */ +public class RestartBackoffTimeStrategyFactoryLoaderTest extends TestLogger { + + private static final RestartStrategies.RestartStrategyConfiguration DEFAULT_RESTART_STRATEGY_CONFIGURATION = + new RestartStrategies.FallbackRestartStrategyConfiguration(); + + @Test + public void testNewStrategySpecified() throws Exception { + // specify RestartBackoffTimeStrategy directly in cluster config + final Configuration conf = new Configuration(); + conf.setString( + RestartBackoffTimeStrategyOptions.RESTART_BACKOFF_TIME_STRATEGY_CLASS_NAME, + TestRestartBackoffTimeStrategy.class.getName()); + + // the RestartStrategyConfiguration should not take effect as the loader will + // directly create the factory from the config of the new version strategy + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + new RestartStrategies.FailureRateRestartStrategyConfiguration( + 1, + Time.milliseconds(1000), + Time.milliseconds(1000)), + conf, + true); + + assertThat( + factory, + instanceOf(TestRestartBackoffTimeStrategy.TestRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testInvalidNewStrategySpecified() throws Exception { + final Configuration conf = new Configuration(); + conf.setString( + RestartBackoffTimeStrategyOptions.RESTART_BACKOFF_TIME_STRATEGY_CLASS_NAME, + InvalidTestRestartBackoffTimeStrategy.class.getName()); + + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + DEFAULT_RESTART_STRATEGY_CONFIGURATION, + conf, + true); + + assertThat( + factory, + instanceOf(NoRestartBackoffTimeStrategy.NoRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testNoStrategySpecifiedWhenCheckpointingEnabled() throws Exception { + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + DEFAULT_RESTART_STRATEGY_CONFIGURATION, + new Configuration(), + true); + + assertThat( + factory, + instanceOf(FixedDelayRestartBackoffTimeStrategy.FixedDelayRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testNoStrategySpecifiedWhenCheckpointingDisabled() throws Exception { + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + DEFAULT_RESTART_STRATEGY_CONFIGURATION, + new Configuration(), + false); + + assertThat( + factory, + instanceOf(NoRestartBackoffTimeStrategy.NoRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testLegacyStrategySpecifiedInJobConfig() throws Exception { + // the fixed delay strategy config in cluster config should not take effect + // as it will be overridden by the failure rate strategy config in job config + final Configuration conf = new Configuration(); + conf.setString(ConfigConstants.RESTART_STRATEGY, "fixed-delay"); + + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + new RestartStrategies.FailureRateRestartStrategyConfiguration( + 1, + Time.milliseconds(1000), + Time.milliseconds(1000)), + conf, + false); + + assertThat( + factory, + instanceOf(FailureRateRestartBackoffTimeStrategy.FailureRateRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testLegacyStrategySpecifiedInClusterConfig() throws Exception { + // the fixed delay strategy config in cluster config should not take effect + // as it will be overridden by the failure rate strategy config in job config + final Configuration conf = new Configuration(); + conf.setString(ConfigConstants.RESTART_STRATEGY, "fixed-delay"); + + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + DEFAULT_RESTART_STRATEGY_CONFIGURATION, + conf, + false); + + assertThat( + factory, + instanceOf(FixedDelayRestartBackoffTimeStrategy.FixedDelayRestartBackoffTimeStrategyFactory.class)); + } + + @Test + public void testDeprecatedValuesSpecifiedInClusterConfig() throws Exception { + // the fixed delay strategy config in cluster config should not take effect + // as it will be overridden by the failure rate strategy config in job config + final Configuration conf = new Configuration(); + conf.setInteger(ConfigConstants.RESTART_STRATEGY_FIXED_DELAY_ATTEMPTS, 1); + + final RestartBackoffTimeStrategy.Factory factory = + RestartBackoffTimeStrategyFactoryLoader.createRestartStrategyFactory( + DEFAULT_RESTART_STRATEGY_CONFIGURATION, + conf, + false); + + assertThat( + factory, + instanceOf(FixedDelayRestartBackoffTimeStrategy.FixedDelayRestartBackoffTimeStrategyFactory.class)); + } + + // ------------------------------------------------------------------------ + // utilities + // ------------------------------------------------------------------------ + + /** + * A test class that has not implemented {@link RestartBackoffTimeStrategy}. + */ + private static class InvalidTestRestartBackoffTimeStrategy {} Review comment: I don't think this is needed. In `testInvalidNewStrategySpecified()`, you can use `Object.class`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
