gaoyunhaii commented on a change in pull request #10736: [FLINK-15010][Network] Add shutdown hook to ensure cleanup netty shuffle directories URL: https://github.com/apache/flink/pull/10736#discussion_r368878781
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java ########## @@ -0,0 +1,187 @@ +/* + * 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.io.disk; + +import org.apache.commons.io.FilenameUtils; +import org.apache.flink.api.common.time.Deadline; +import org.apache.flink.runtime.testutils.TestJvmProcess; +import org.apache.flink.util.OperatingSystem; +import org.apache.flink.util.ShutdownHookUtil; +import org.apache.flink.util.TestLogger; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.time.Duration; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + +/** + * Tests the logic of {@link FileChannelManagerImpl}. + */ +public class FileChannelManagerImplTest extends TestLogger { + private static final Logger LOG = LoggerFactory.getLogger(FileChannelManagerImplTest.class); + + private static final String DIR_NAME_PREFIX = "manager-test"; + + private static final String COULD_KILL_SIGNAL_FILE = "could-kill"; + + private static final Duration TEST_TIMEOUT = Duration.ofSeconds(10); + + @Rule + public final TemporaryFolder temporaryFolder = new TemporaryFolder(); + + @Test + public void testDirectoriesCleanupOnKillWithoutCallerHook() throws Exception { + testDirectoriesCleanupOnKill(false); + } + + @Test + public void testDirectoriesCleanupOnKillWithCallerHook() throws Exception { + testDirectoriesCleanupOnKill(true); + } + + private void testDirectoriesCleanupOnKill(boolean callerHasHook) throws Exception { + assumeTrue(OperatingSystem.isLinux() + || OperatingSystem.isFreeBSD() + || OperatingSystem.isSolaris() + || OperatingSystem.isMac()); + + File fileChannelDir = temporaryFolder.newFolder(); + File signalDir = temporaryFolder.newFolder(); + + FileChannelManagerTestProcess fileChannelManagerTestProcess = new FileChannelManagerTestProcess( + callerHasHook, + fileChannelDir.getAbsolutePath(), + FilenameUtils.concat(signalDir.getAbsolutePath(), COULD_KILL_SIGNAL_FILE)); + + try { + fileChannelManagerTestProcess.startProcess(); + + // Waits till netty shuffle environment has created the tmp directories. + Deadline deadline = Deadline.now().plus(TEST_TIMEOUT); + + while (!fileOrDirExists(signalDir, COULD_KILL_SIGNAL_FILE) && deadline.hasTimeLeft()) { + Thread.sleep(100); + } + + if (!fileOrDirExists(signalDir, COULD_KILL_SIGNAL_FILE) || Review comment: I have modified the code accordingly. ---------------------------------------------------------------- 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
