tillrohrmann commented on a change in pull request #8988: [FLINK-12736][coordination] Release TaskExecutor in SlotManager if no slot allocations after partition check URL: https://github.com/apache/flink/pull/8988#discussion_r301137619
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/slotmanager/TaskManagerReleaseInSlotManagerTest.java ########## @@ -0,0 +1,165 @@ +/* + * 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.resourcemanager.slotmanager; + +import org.apache.flink.api.common.JobID; +import org.apache.flink.api.common.time.Time; +import org.apache.flink.runtime.clusterframework.types.AllocationID; +import org.apache.flink.runtime.clusterframework.types.ResourceID; +import org.apache.flink.runtime.clusterframework.types.ResourceProfile; +import org.apache.flink.runtime.clusterframework.types.SlotID; +import org.apache.flink.runtime.concurrent.ManuallyTriggeredScheduledExecutor; +import org.apache.flink.runtime.instance.InstanceID; +import org.apache.flink.runtime.resourcemanager.ResourceManagerId; +import org.apache.flink.runtime.resourcemanager.SlotRequest; +import org.apache.flink.runtime.resourcemanager.registration.TaskExecutorConnection; +import org.apache.flink.runtime.taskexecutor.SlotReport; +import org.apache.flink.runtime.taskexecutor.SlotStatus; +import org.apache.flink.runtime.taskexecutor.TaskExecutorGateway; +import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; +import org.apache.flink.runtime.testingUtils.TestingUtils; +import org.apache.flink.util.TestLogger; +import org.junit.Before; +import org.junit.Test; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.concurrent.atomic.AtomicReference; + +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +/** + * Test suite for idle task managers release in slot manager. + */ +public class TaskManagerReleaseInSlotManagerTest extends TestLogger { + private static final ResourceID resourceID = ResourceID.generate(); + private static final ResourceManagerId resourceManagerId = ResourceManagerId.generate(); + private static final SlotID slotId = new SlotID(resourceID, 0); + private static final ResourceProfile resourceProfile = new ResourceProfile(1.0, 1); + private static final SlotStatus slotStatus = new SlotStatus(slotId, resourceProfile); + private static final SlotReport slotReport = new SlotReport(slotStatus); + + private final AtomicReference<CompletableFuture<Boolean>> canBeReleased = new AtomicReference<>(); + private final TaskExecutorGateway taskExecutorGateway = new TestingTaskExecutorGatewayBuilder() + .setCanBeReleasedSupplier(canBeReleased::get) + .createTestingTaskExecutorGateway(); + private final TaskExecutorConnection taskManagerConnection = + new TaskExecutorConnection(resourceID, taskExecutorGateway); + + private CompletableFuture<InstanceID> releaseFuture; + private ResourceActions resourceManagerActions; + private ManuallyTriggeredScheduledExecutor mainThreadExecutor; + + @Before + public void setup() { + releaseFuture = new CompletableFuture<>(); + resourceManagerActions = new TestingResourceActionsBuilder() + .setReleaseResourceConsumer((instanceID, e) -> releaseFuture.complete(instanceID)) + .build(); + mainThreadExecutor = new ManuallyTriggeredScheduledExecutor(); + } + + /** + * Tests that idle task managers time out after the configured timeout. A timed out task manager + * will be removed from the slot manager and the resource manager will be notified about the + * timeout, if it can be released. + */ + @Test + public void testTaskManagerTimeout() throws Exception { + Executor executor = TestingUtils.defaultExecutor(); + canBeReleased.set(new CompletableFuture<>()); + canBeReleased.get().complete(true); + try (SlotManager slotManager = SlotManagerBuilder + .newBuilder() + .setTaskManagerTimeout(Time.milliseconds(10L)) + .build()) { + + slotManager.start(resourceManagerId, executor, resourceManagerActions); + executor.execute(() -> slotManager.registerTaskManager(taskManagerConnection, slotReport)); + assertThat(releaseFuture.get(), is(equalTo(taskManagerConnection.getInstanceID()))); + } + } + + /** + * Tests that idle but not releasable task managers will not be released even if timed out before it can be. + */ + @Test + public void testTaskManagerIsNotReleasedBeforeItCanBe() throws Exception { + try (SlotManager slotManager = createAndStartSlotManagerWithTM()) { + testTaskManagerIsNotReleasedBeforeItCanBe(slotManager); + testTaskManagerReleasedAfterItCanBe(slotManager); + } + } + + /** + * Tests that idle task managers will not be released after "can be" check in case of concurrent resource allocations. + */ + @Test + public void testTaskManagerIsNotReleasedInCaseOfConcurrentAllocation() throws Exception { + try (SlotManager slotManager = createAndStartSlotManagerWithTM()) { + resetCanBeReleasedFutureAndTriggerTimeoutCheck(slotManager); Review comment: I think it would be better to reset the `canBeRelease` atomic field in the `@Before` method. Each test should start with a clean slate because otherwise tests might interfere with each other too easily. ---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
