You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2018/06/26 08:12:04 UTC
flink git commit: [FLINK-7897] Use nio.Files for file deletion in
TransientBlobCleanupTask
Repository: flink
Updated Branches:
refs/heads/master 5fa61d8ce -> 8674b6996
[FLINK-7897] Use nio.Files for file deletion in TransientBlobCleanupTask
This closes #5777.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8674b699
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8674b699
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8674b699
Branch: refs/heads/master
Commit: 8674b69964eae50cad024f2c5caf92a71bf21a09
Parents: 5fa61d8
Author: yanghua <ya...@gmail.com>
Authored: Wed Mar 28 10:37:35 2018 +0800
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Tue Jun 26 10:10:54 2018 +0200
----------------------------------------------------------------------
.../flink/runtime/blob/TransientBlobCleanupTask.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8674b699/flink-runtime/src/main/java/org/apache/flink/runtime/blob/TransientBlobCleanupTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/TransientBlobCleanupTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/TransientBlobCleanupTask.java
index 5dc7678..b8bd41a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/TransientBlobCleanupTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/TransientBlobCleanupTask.java
@@ -24,6 +24,7 @@ import org.apache.flink.api.java.tuple.Tuple2;
import org.slf4j.Logger;
import java.io.File;
+import java.nio.file.Files;
import java.util.Map;
import java.util.Set;
import java.util.TimerTask;
@@ -100,9 +101,13 @@ class TransientBlobCleanupTask extends TimerTask {
writeLock.lock();
try {
- if (!localFile.delete() && localFile.exists()) {
- log.warn("Failed to locally delete blob " + localFile.getAbsolutePath());
- } else {
+ try {
+ Files.delete(localFile.toPath());
+ } catch (Exception e) {
+ log.error("Failed to delete local blob " + localFile.getAbsolutePath(), e);
+ }
+
+ if (!localFile.exists()) {
// this needs to happen inside the write lock in case of concurrent getFile() calls
entries.remove(entry);
}