You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2017/05/26 08:42:04 UTC
[5/8] flink git commit: [FLINK-6704][yarn] Fix user-jars not being
possible to exclude from system class path
[FLINK-6704][yarn] Fix user-jars not being possible to exclude from system class path
This closes #3979.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4ae040c1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4ae040c1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4ae040c1
Branch: refs/heads/release-1.3
Commit: 4ae040c141c1eb675883a3857de9163d22556b89
Parents: 2e138f1
Author: zentol <ch...@apache.org>
Authored: Wed May 24 15:08:57 2017 +0200
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Fri May 26 16:33:29 2017 +0800
----------------------------------------------------------------------
.../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4ae040c1/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
index 044d1e7..b9a4416 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java
@@ -671,7 +671,13 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
// upload and register ship files
List<String> systemClassPaths = uploadAndRegisterFiles(systemShipFiles, fs, appId.toString(), paths, localResources, envShipFileList);
- List<String> userClassPaths = uploadAndRegisterFiles(userJarFiles, fs, appId.toString(), paths, localResources, envShipFileList);
+
+ List<String> userClassPaths;
+ if (userJarInclusion != YarnConfigOptions.UserJarInclusion.DISABLED) {
+ userClassPaths = uploadAndRegisterFiles(userJarFiles, fs, appId.toString(), paths, localResources, envShipFileList);
+ } else {
+ userClassPaths = Collections.emptyList();
+ }
if (userJarInclusion == YarnConfigOptions.UserJarInclusion.ORDER) {
systemClassPaths.addAll(userClassPaths);