From 84b0a7c08b6c1976f8a040c20d2fc9b1c603ae3f Mon Sep 17 00:00:00 2001 From: zentol Date: Wed, 17 Feb 2016 10:54:07 +0100 Subject: [PATCH 1/4] [FLINK-3426] Fixed JobManagerLeader[Re]ElectionTest.testleaderElection onWindows --- .../apache/flink/runtime/blob/FileSystemBlobStore.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index 4c6387326fff9..dbfb0ce481e6c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -63,13 +63,7 @@ class FileSystemBlobStore implements BlobStore { this.basePath = stateBackendBasePath; - try { - FileSystem.get(new URI(basePath)).mkdirs(new Path(basePath)); - } - catch (URISyntaxException e) { - throw new IOException(e); - } - + FileSystem.get(new File(basePath).toURI()).mkdirs(new Path(basePath)); LOG.info("Created blob directory {}.", basePath); } From 9a296f926d339939a7ee3d036b421b15406c1493 Mon Sep 17 00:00:00 2001 From: zentol Date: Wed, 17 Feb 2016 14:06:10 +0100 Subject: [PATCH 2/4] removed unused import --- .../java/org/apache/flink/runtime/blob/FileSystemBlobStore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index dbfb0ce481e6c..7176ce67b8798 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -35,7 +35,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URI; -import java.net.URISyntaxException; import static com.google.common.base.Preconditions.checkNotNull; From 43e216bfddea5b394951e48e206a62f0bf087480 Mon Sep 17 00:00:00 2001 From: zentol Date: Tue, 23 Feb 2016 14:30:18 +0100 Subject: [PATCH 3/4] use new Path().toUri() --- .../java/org/apache/flink/runtime/blob/FileSystemBlobStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index 7176ce67b8798..d153ec946d964 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -62,7 +62,7 @@ class FileSystemBlobStore implements BlobStore { this.basePath = stateBackendBasePath; - FileSystem.get(new File(basePath).toURI()).mkdirs(new Path(basePath)); + FileSystem.get(new Path(basePath).toUri).mkdirs(new Path(basePath)); LOG.info("Created blob directory {}.", basePath); } From 386e285de5044994ace82c745f326709c032508f Mon Sep 17 00:00:00 2001 From: zentol Date: Tue, 23 Feb 2016 14:33:17 +0100 Subject: [PATCH 4/4] added missing braces --- .../java/org/apache/flink/runtime/blob/FileSystemBlobStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index d153ec946d964..e7a306b8720b4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -62,7 +62,7 @@ class FileSystemBlobStore implements BlobStore { this.basePath = stateBackendBasePath; - FileSystem.get(new Path(basePath).toUri).mkdirs(new Path(basePath)); + FileSystem.get(new Path(basePath).toUri()).mkdirs(new Path(basePath)); LOG.info("Created blob directory {}.", basePath); }