You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/07/16 12:12:10 UTC
[flink] branch master updated: [FLINK-11428][tests] Prevent file
leak
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 f9c3a13 [FLINK-11428][tests] Prevent file leak
f9c3a13 is described below
commit f9c3a138848f35e227ad6b57028697b6ff2d0382
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Jul 16 14:09:05 2019 +0200
[FLINK-11428][tests] Prevent file leak
---
.../iomanager/BufferFileWriterFileSegmentReaderTest.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/BufferFileWriterFileSegmentReaderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/BufferFileWriterFileSegmentReaderTest.java
index 88f241e..d20a2b5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/BufferFileWriterFileSegmentReaderTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/BufferFileWriterFileSegmentReaderTest.java
@@ -24,6 +24,7 @@ import org.apache.flink.runtime.io.network.buffer.BufferRecycler;
import org.apache.flink.runtime.io.network.buffer.FreeingBufferRecycler;
import org.apache.flink.runtime.io.network.buffer.NetworkBuffer;
import org.apache.flink.runtime.util.event.NotificationListener;
+import org.apache.flink.util.IOUtils;
import org.junit.After;
import org.junit.AfterClass;
@@ -73,13 +74,7 @@ public class BufferFileWriterFileSegmentReaderTest {
reader = (AsynchronousBufferFileSegmentReader) ioManager.createBufferFileSegmentReader(channel, new QueuingCallback<>(returnedFileSegments));
}
catch (IOException e) {
- if (writer != null) {
- writer.deleteChannel();
- }
-
- if (reader != null) {
- reader.deleteChannel();
- }
+ tearDownWriterAndReader();
fail("Failed to setup writer and reader.");
}
@@ -88,10 +83,16 @@ public class BufferFileWriterFileSegmentReaderTest {
@After
public void tearDownWriterAndReader() {
if (writer != null) {
+ if (!writer.isClosed()) {
+ IOUtils.closeQuietly(() -> writer.close());
+ }
writer.deleteChannel();
}
if (reader != null) {
+ if (!reader.isClosed()) {
+ IOUtils.closeQuietly(() -> reader.close());
+ }
reader.deleteChannel();
}