You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by tillrohrmann <gi...@git.apache.org> on 2017/08/26 17:32:26 UTC
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
GitHub user tillrohrmann opened a pull request:
https://github.com/apache/flink/pull/4601
[FLINK-7532] Add web content handler to DispatcherRestEndpoint
## What is the purpose of the change
Adds the StaticFileContentHandler to the DispatcherRestEndpoint if the
flink-runtime-web dependency is in the classpath. In order to setup the
respective channel handler, this commit introduces the `setupChannelHandlers`
method to the RestServerEndpoint.
## Verifying this change
It was manually checked that the `DispatcherRestEndpoint` serves static file contents.
## Does this pull request potentially affect one of the following parts:
- Dependencies (does it add or upgrade a dependency): (no)
- The public API, i.e., is any changed class annotated with `@Public(Evolving)`: (no)
- The serializers: (no)
- The runtime per-record code paths (performance sensitive): (no)
- Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Yarn/Mesos, ZooKeeper: (no)
## Documentation
- Does this pull request introduce a new feature? (no)
- If yes, how is the feature documented? (not applicable)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/tillrohrmann/flink webContentHandler
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/flink/pull/4601.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #4601
----
commit 7835d0a89c8ecdd5b9661ee8c57a9d63a3ed3742
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-14T13:47:04Z
[FLINK-7522] Add termination future to ClusterEntrypoint
The termination future is completed when the ClusterEntrypoint shuts down. This
allows for easier testing.
commit 2cdf97f824bc62a82e65f4c160b9ad64de446de4
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-16T12:36:13Z
[FLINK-7457] Make Dispatcher highly available
This commit introduces a dispatcher leader election and retrieval service to the
HighAvailabilityServices. Moreover it adds code such that the Dispatcher now takes
part in the leader election process using the afore-mentioned services.
Let Dispatcher participate in leader election
Add test for Dispatcher leader election
commit 04caf85d33ddfc3a4a9b788745b8282c3437d8e2
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-10T08:56:12Z
[FLINK-7409] [web] Make WebRuntimeMonitor reactive
This commit changes the behaviour of the WebRuntimeMonitor to not longer block serving
threads by waiting on the result of futures. Instead the RequestHandler now returns a
CompletableFuture<FullHttpResponse> which is written out to the Netty channel upon
completion. This will improve the performance of our WebRuntimeMonitor.
commit 4fa6dedd95555a2d1a91339ff5effda3bc2bd1d5
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-15T10:00:58Z
[FLINK-7458] Generalize GatewayRetriever for WebRuntimeMonitor
Introduce a generalized GatewayRetriever replacing the JobManagerRetriever. The
GatewayRetriever fulfills the same purpose as the JobManagerRetriever with the
ability to retrieve the gateway for an arbitrary endpoint type.
commit 0f9b2ce77e20f25fc95ddeba98f863b86450a72c
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-15T11:55:47Z
[FLINK-7459] Generalize Flink's redirection logic
Introduce RedirectHandler which can be extended to add redirection functionality to all
SimpleInboundChannelHandlers. This allows to share the same functionality across the
StaticFileServerHandler and the RuntimeMonitorHandlerBase which could now be removed.
In the future, the AbstractRestHandler will also extend the RedirectHandler.
commit 88aed4f7a198b3994271088b8e19558d399ddd9d
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-17T13:04:19Z
[FLINK-7527] [rest] Let AbstractRestHandler extend RedirectHandler
By letting the AbstractRestHandler extend the RedirectHandler, we add redirection
capabilities to the AbstractRestHandler.
commit 9b7de1dc21b771fc10ee1661f34c142e990b424f
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-17T13:25:33Z
[FLINK-7528] Create DispatcherRestEndpoint and integrate with Dispatcher
This commit creates the DispatcherRestEndpoint and integrates it with the
Dispatcher. The DispatcherRestEndpoint is created in the SessionClusterEntrypoint
and its address is passed to the Dispatcher such that it can answer the
requestRestAddress RPC.
commit 5e1d0962e654038894fa376e86b1eeb1565c851b
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-17T14:55:03Z
[FLINK-7529] Retrieve complete REST address from gateway
With this change, the complete REST address (protocol://hostname:port) is retrieved
from the RestfulGateway. That way we decouple the RestHandlers from the underlying
RestServerEndpoint/WebRuntimeMonitor because they no longer have to know whether
HTTPs is enabled or not.
commit 7de9e4fa387bf355b0b3d5b520f522b80b3f14fa
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-18T07:52:30Z
[FLINK-7531] Move Flink legacy rest handler to flink-runtime
Move metrics handlers under o.a.f.runtime.webmonitor.handlers
Move StaticFileServerHandler under o.a.f.runtime.webmonitor.files
commit cffb1ce128a5f6c5f2a3a9461ce1895fe0269273
Author: Till Rohrmann <tr...@apache.org>
Date: 2017-08-18T12:05:11Z
[FLINK-7532] Add web content handler to DispatcherRestEndpoint
Adds the StaticFileContentHandler to the DispatcherRestEndpoint if the
flink-runtime-web dependency is in the classpath. In order to setup the
respective channel handler, this commit introduces the setupChannelHandlers
method to the RestServerEndpoint.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] flink issue #4601: [FLINK-7532] Add web content handler to DispatcherRestEnd...
Posted by tillrohrmann <gi...@git.apache.org>.
Github user tillrohrmann commented on the issue:
https://github.com/apache/flink/pull/4601
Thanks for the review @zentol. Once the preceding PRs have been merged and Travis gives green light, I'll merge this PR.
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4601#discussion_r139633588
--- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java ---
@@ -77,8 +74,11 @@ protected void setupChannelHandlers(Router router, CompletableFuture<String> res
optWebContent = Optional.empty();
}
- optWebContent.ifPresent(
- webContentHandler -> router.GET("/:*", webContentHandler));
+ return optWebContent
+ .map(webContent ->
+ Collections.singleton(
+ Tuple2.<RestHandlerSpecification, ChannelInboundHandler>of(WebContentHandlerSpecification.getInstance(), webContent)))
+ .orElseGet(() -> Collections.emptySet());
--- End diff --
Given that we're adding new handlers soon we may want to write things so that we can more easily extend the collection it without rewriting most of this block.
```
Collection<Tuple2<RestHandlerSpecification, ChannelInboundHandler>> result = new ArrayList<>();
optWebContent
.map(webContent -> result.add(webContent));
return result;
```
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by tillrohrmann <gi...@git.apache.org>.
Github user tillrohrmann commented on a diff in the pull request:
https://github.com/apache/flink/pull/4601#discussion_r139900700
--- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/files/WebContentHandlerSpecification.java ---
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.rest.handler.legacy.files;
+
+import org.apache.flink.runtime.rest.HttpMethodWrapper;
+import org.apache.flink.runtime.rest.handler.RestHandlerSpecification;
+
+/**
+ * Rest handler specification for the web content handler.
+ */
+public final class WebContentHandlerSpecification implements RestHandlerSpecification {
+
+ private static final WebContentHandlerSpecification INSTANCE = new WebContentHandlerSpecification();
+
+ private WebContentHandlerSpecification() {
+ throw new UnsupportedOperationException("Should not be called directly.");
--- End diff --
Good catch. Looking at it again, this must have been a brain fart ;-)
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4601#discussion_r139684288
--- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java ---
@@ -77,8 +74,11 @@ protected void setupChannelHandlers(Router router, CompletableFuture<String> res
optWebContent = Optional.empty();
}
- optWebContent.ifPresent(
- webContentHandler -> router.GET("/:*", webContentHandler));
+ return optWebContent
+ .map(webContent ->
+ Collections.singleton(
+ Tuple2.<RestHandlerSpecification, ChannelInboundHandler>of(WebContentHandlerSpecification.getInstance(), webContent)))
+ .orElseGet(() -> Collections.emptySet());
--- End diff --
sure
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/flink/pull/4601
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4601#discussion_r139900356
--- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/files/WebContentHandlerSpecification.java ---
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.rest.handler.legacy.files;
+
+import org.apache.flink.runtime.rest.HttpMethodWrapper;
+import org.apache.flink.runtime.rest.handler.RestHandlerSpecification;
+
+/**
+ * Rest handler specification for the web content handler.
+ */
+public final class WebContentHandlerSpecification implements RestHandlerSpecification {
+
+ private static final WebContentHandlerSpecification INSTANCE = new WebContentHandlerSpecification();
+
+ private WebContentHandlerSpecification() {
+ throw new UnsupportedOperationException("Should not be called directly.");
--- End diff --
this will fail the instantiation of the singleton....
---
[GitHub] flink pull request #4601: [FLINK-7532] Add web content handler to Dispatcher...
Posted by tillrohrmann <gi...@git.apache.org>.
Github user tillrohrmann commented on a diff in the pull request:
https://github.com/apache/flink/pull/4601#discussion_r139682161
--- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java ---
@@ -77,8 +74,11 @@ protected void setupChannelHandlers(Router router, CompletableFuture<String> res
optWebContent = Optional.empty();
}
- optWebContent.ifPresent(
- webContentHandler -> router.GET("/:*", webContentHandler));
+ return optWebContent
+ .map(webContent ->
+ Collections.singleton(
+ Tuple2.<RestHandlerSpecification, ChannelInboundHandler>of(WebContentHandlerSpecification.getInstance(), webContent)))
+ .orElseGet(() -> Collections.emptySet());
--- End diff --
I would like to do this in one of the follow up PRs where I actually add more REST handlers, if that's ok.
---