You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by zentol <gi...@git.apache.org> on 2017/08/01 12:45:57 UTC
[GitHub] flink pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
GitHub user zentol opened a pull request:
https://github.com/apache/flink/pull/4452
[FLINK-7013] [shading] Introduce flink-shaded-netty-4
This PR is based on #4425.
## What is the purpose of the change
This PR integrates the shaded netty dependency from flink-shaded. Basically, replace all usages of netty with the shaded netty dependeny and remove all traves of the original dependeny.
## Brief change log
- replace all netty/netty-router dependencies with flink-shaded-netty
- replace all netty imports
- modify illegal import checkstyle rule to forbid unshaded netty imports
- add check in travis watchdog that no unshaded netty classes are present in flink-dist
## Verifying this change
- check that compilation works
- check artifacts for inclusion of shaded netty
- check artifacts for exclusion of unshaded netty
- check that we are not exposing a vanilla netty dependency with maven
- start a cluster and run some examples
- check that the web interface still works
## Does this pull request potentially affect one of the following parts:
- Dependencies (does it add or upgrade a dependency): (yes)
- 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/zentol/flink 7013
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/flink/pull/4452.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 #4452
----
commit cda79e8b318d146af910873b090f7e1f3543d6b1
Author: zentol <ch...@apache.org>
Date: 2017-06-13T15:02:03Z
[FLINK-7305] [checkstyle] Allow imports from org.apache.flink.shaded + add new import block
commit af3ac36c00c9881f4692596dbc6791dfbc1705f0
Author: zentol <ch...@apache.org>
Date: 2017-06-27T12:27:16Z
[FLINK-7013] Introduce flink-shaded-netty-4
----
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130684098
--- Diff: flink-dist/pom.xml ---
@@ -204,6 +204,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-netty</artifactId>
+ </dependency>
--- End diff --
I'll check whether it is necessary and remove it if it isnt.
---
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 #4452: [FLINK-7013] [shading] Introduce flink-shaded-netty-4
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on the issue:
https://github.com/apache/flink/pull/4452
merging.
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130909676
--- Diff: tools/travis_mvn_watchdog.sh ---
@@ -290,6 +290,15 @@ check_shaded_artifacts() {
echo "=============================================================================="
return 1
fi
+
+ NETTY=`cat allClasses | grep '^io/netty' | wc -1`
--- End diff --
nice catch, will fix it.
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by rmetzger <gi...@git.apache.org>.
Github user rmetzger commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130615205
--- Diff: flink-dist/pom.xml ---
@@ -204,6 +204,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-netty</artifactId>
+ </dependency>
--- End diff --
Why does this need to be added explicitly to flink-dist?
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by rmetzger <gi...@git.apache.org>.
Github user rmetzger commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130890710
--- Diff: tools/travis_mvn_watchdog.sh ---
@@ -290,6 +290,15 @@ check_shaded_artifacts() {
echo "=============================================================================="
return 1
fi
+
+ NETTY=`cat allClasses | grep '^io/netty' | wc -1`
--- End diff --
really minor, but: Tab vs space
---
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 #4452: [FLINK-7013] [shading] Introduce flink-shaded-netty-4
Posted by rmetzger <gi...@git.apache.org>.
Github user rmetzger commented on the issue:
https://github.com/apache/flink/pull/4452
+1 to merge:
- Checked with a project depending on Flink. It doesn't fail anymore after using your PR
- mvn build passes
- the dependency-red-pom of flink-runtime looks good (no netty deps)
- start-local.sh works.
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/flink/pull/4452
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130619047
--- Diff: flink-dist/pom.xml ---
@@ -204,6 +204,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-netty</artifactId>
+ </dependency>
--- End diff --
This may be a relic of a previous version where all other dependency declarations were set to `<provided>`.
---
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 pull request #4452: [FLINK-7013] [shading] Introduce flink-shaded-nett...
Posted by rmetzger <gi...@git.apache.org>.
Github user rmetzger commented on a diff in the pull request:
https://github.com/apache/flink/pull/4452#discussion_r130668606
--- Diff: flink-dist/pom.xml ---
@@ -204,6 +204,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-netty</artifactId>
+ </dependency>
--- End diff --
So we are going to keep it?
---
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 #4452: [FLINK-7013] [shading] Introduce flink-shaded-netty-4
Posted by zentol <gi...@git.apache.org>.
Github user zentol commented on the issue:
https://github.com/apache/flink/pull/4452
@rmetzger I've removed the dependency from flink-dist; it wasn't necessary.
---
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.
---