[FLINK-9584][connector] Properly close output streams in Bucketing-/R…

…ollingSink This closes apache#6164.
tongcheng-elong · Jul 11, 2018 · 04a7cd4 · 04a7cd4
1 parent 5dbb6dd
commit 04a7cd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/...nector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java b/...nector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java
@@ -533,12 +533,9 @@ private Method reflectTruncate(FileSystem fs) {
  }
 
  // verify that truncate actually works
- FSDataOutputStream outputStream;
  Path testPath = new Path(UUID.randomUUID().toString());
- try {
- outputStream = fs.create(testPath);
+ try (FSDataOutputStream outputStream = fs.create(testPath)) {
  outputStream.writeUTF("hello");
- outputStream.close();
  } catch (IOException e) {
  LOG.error("Could not create file for checking if truncate works.", e);
  throw new RuntimeException("Could not create file for checking if truncate works.", e);
@@ -702,9 +699,9 @@ private void handleRestoredBucketState(BucketState bucketState) {
  Path validLengthFilePath = getValidLengthPathFor(partPath);
  if (!fs.exists(validLengthFilePath) && fs.exists(partPath)) {
  LOG.debug("Writing valid-length file for {} to specify valid length {}", partPath, bucketState.currentFileValidLength);
- FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath);
- lengthFileOut.writeUTF(Long.toString(bucketState.currentFileValidLength));
- lengthFileOut.close();
+ try (FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath)) {
+  lengthFileOut.writeUTF(Long.toString(bucketState.currentFileValidLength));
+ }
  }
  }
 

diff --git a/...ystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java b/...ystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
@@ -631,12 +631,9 @@ private Method reflectTruncate(FileSystem fs) {
  }
 
  // verify that truncate actually works
- FSDataOutputStream outputStream;
  Path testPath = new Path(UUID.randomUUID().toString());
- try {
- outputStream = fs.create(testPath);
+ try (FSDataOutputStream outputStream = fs.create(testPath)) {
  outputStream.writeUTF("hello");
- outputStream.close();
  } catch (IOException e) {
  LOG.error("Could not create file for checking if truncate works.", e);
  throw new RuntimeException("Could not create file for checking if truncate works. " +
@@ -880,9 +877,9 @@ private void handlePendingInProgressFile(String file, long validLength) {
  Path validLengthFilePath = getValidLengthPathFor(partPath);
  if (!fs.exists(validLengthFilePath) && fs.exists(partPath)) {
  LOG.debug("Writing valid-length file for {} to specify valid length {}", partPath, validLength);
- FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath);
- lengthFileOut.writeUTF(Long.toString(validLength));
- lengthFileOut.close();
+ try (FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath)) {
+  lengthFileOut.writeUTF(Long.toString(validLength));
+ }
  }
  }