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

commit 3bad7aa394f9fa5f810e16aae0cfdd1fe1ea1553
Author: zentol <[email protected]>
AuthorDate: Tue Aug 21 12:36:28 2018 +0200

    [hotfix][rest] Extend logging
---
 .../src/main/java/org/apache/flink/runtime/rest/AbstractHandler.java | 1 +
 .../main/java/org/apache/flink/runtime/rest/FileUploadHandler.java   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/AbstractHandler.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/AbstractHandler.java
index 0d8605a..3d1ec9d 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/AbstractHandler.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/AbstractHandler.java
@@ -145,6 +145,7 @@ public abstract class AbstractHandler<T extends 
RestfulGateway, R extends Reques
                                        hre);
                        }
 
+                       log.trace("Starting request processing.");
                        CompletableFuture<Void> requestProcessingFuture = 
respondToRequest(
                                ctx,
                                httpRequest,
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 d628750..11ff00a 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
@@ -94,6 +94,7 @@ public class FileUploadHandler extends 
SimpleChannelInboundHandler<HttpObject> {
                                LOG.trace("Received request. URL:{} Method:{}", 
httpRequest.getUri(), httpRequest.getMethod());
                                if 
(httpRequest.getMethod().equals(HttpMethod.POST)) {
                                        if 
(HttpPostRequestDecoder.isMultipart(httpRequest)) {
+                                               LOG.trace("Initializing 
multipart file upload.");
                                                
checkState(currentHttpPostRequestDecoder == null);
                                                checkState(currentHttpRequest 
== null);
                                                checkState(currentUploadDir == 
null);
@@ -107,6 +108,7 @@ public class FileUploadHandler extends 
SimpleChannelInboundHandler<HttpObject> {
                                        
ctx.fireChannelRead(ReferenceCountUtil.retain(msg));
                                }
                        } else if (msg instanceof HttpContent && 
currentHttpPostRequestDecoder != null) {
+                               LOG.trace("Received http content.");
                                // make sure that we still have a upload dir in 
case that it got deleted in the meanwhile
                                RestServerEndpoint.createUploadDir(uploadDir, 
LOG);
 
@@ -121,9 +123,11 @@ public class FileUploadHandler extends 
SimpleChannelInboundHandler<HttpObject> {
 
                                                final Path dest = 
currentUploadDir.resolve(fileUpload.getFilename());
                                                
fileUpload.renameTo(dest.toFile());
+                                               LOG.trace("Upload of file {} 
complete.", fileUpload.getFilename());
                                        } else if (data.getHttpDataType() == 
InterfaceHttpData.HttpDataType.Attribute) {
                                                final Attribute request = 
(Attribute) data;
                                                // this could also be 
implemented by using the first found Attribute as the payload
+                                               LOG.trace("Upload of attribute 
{} complete.", request.getName());
                                                if 
(data.getName().equals(HTTP_ATTRIBUTE_REQUEST)) {
                                                        currentJsonPayload = 
request.get();
                                                } else {
@@ -134,6 +138,7 @@ public class FileUploadHandler extends 
SimpleChannelInboundHandler<HttpObject> {
                                }
 
                                if (httpContent instanceof LastHttpContent) {
+                                       LOG.trace("Finalizing multipart file 
upload.");
                                        
ctx.channel().attr(UPLOADED_FILES).set(new FileUploads(currentUploadDir));
                                        ctx.fireChannelRead(currentHttpRequest);
                                        if (currentJsonPayload != null) {

Reply via email to