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 2018/07/06 09:48:49 UTC
[1/2] flink git commit: [FLINK-9770][rest] Fix jar listing
Repository: flink
Updated Branches:
refs/heads/master cc595354e -> ac5432101
[FLINK-9770][rest] Fix jar listing
This closes #6269.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b346961a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b346961a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b346961a
Branch: refs/heads/master
Commit: b346961a308e594db43da9a58d94a988e3bb1861
Parents: cc59535
Author: zentol <ch...@apache.org>
Authored: Thu Jul 5 22:57:02 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Fri Jul 6 11:47:34 2018 +0200
----------------------------------------------------------------------
.../flink/runtime/webmonitor/handlers/JarUploadHandler.java | 5 +++--
.../flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b346961a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
index 83db224..385244d 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
@@ -38,6 +38,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;
@@ -82,7 +83,7 @@ public class JarUploadHandler extends
"Only Jar files are allowed.",
HttpResponseStatus.BAD_REQUEST));
} else {
- final Path destination = jarDir.resolve(fileUpload.getFileName());
+ final Path destination = jarDir.resolve(UUID.randomUUID() + "_" + fileUpload.getFileName());
try {
Files.move(fileUpload, destination);
} catch (IOException e) {
@@ -93,7 +94,7 @@ public class JarUploadHandler extends
HttpResponseStatus.INTERNAL_SERVER_ERROR,
e));
}
- return new JarUploadResponseBody(fileUpload
+ return new JarUploadResponseBody(destination
.normalize()
.toString());
}
http://git-wip-us.apache.org/repos/asf/flink/blob/b346961a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
index c9e25ed..164171d 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
@@ -104,7 +104,10 @@ public class JarUploadHandlerTest extends TestLogger {
final JarUploadResponseBody jarUploadResponseBody = jarUploadHandler.handleRequest(request, mockDispatcherGateway).get();
assertThat(jarUploadResponseBody.getStatus(), equalTo(JarUploadResponseBody.UploadStatus.success));
- assertThat(jarUploadResponseBody.getFilename(), equalTo(uploadedFile.normalize().toString()));
+ final String returnedFileNameWithUUID = jarUploadResponseBody.getFilename();
+ assertThat(returnedFileNameWithUUID, containsString("_"));
+ final String returnedFileName = returnedFileNameWithUUID.substring(returnedFileNameWithUUID.indexOf("_") + 1);
+ assertThat(returnedFileName, equalTo(uploadedFile.getFileName().toString()));
}
@Test
[2/2] flink git commit: [FLINK-9769][rest] Clear FileUpload attribute
after access
Posted by ch...@apache.org.
[FLINK-9769][rest] Clear FileUpload attribute after access
This closes #6270.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ac543210
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ac543210
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ac543210
Branch: refs/heads/master
Commit: ac5432101d58db147ebafebeec05af633f76f7af
Parents: b346961
Author: zentol <ch...@apache.org>
Authored: Thu Jul 5 23:28:47 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Fri Jul 6 11:48:17 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/runtime/rest/FileUploadHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ac543210/flink-runtime/src/main/java/org/apache/flink/runtime/rest/FileUploadHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/FileUploadHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/FileUploadHandler.java
index 3341e32..a957b63 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/FileUploadHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/FileUploadHandler.java
@@ -188,7 +188,7 @@ public class FileUploadHandler extends SimpleChannelInboundHandler<HttpObject> {
}
public static FileUploads getMultipartFileUploads(ChannelHandlerContext ctx) {
- return Optional.ofNullable(ctx.channel().attr(UPLOADED_FILES).get())
+ return Optional.ofNullable(ctx.channel().attr(UPLOADED_FILES).getAndRemove())
.orElse(FileUploads.EMPTY);
}
}