Repository: flink Updated Branches: refs/heads/master f36aa6ff3 -> 7ab6837fd
[FLINK-3675][yarn] use classpath paths relative to the application home This fixes a regression of 0483ba583c7790d13b8035c2916318a2b58c67d6 where the classpath would start off with the application master's home dir. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/16cdb612 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/16cdb612 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/16cdb612 Branch: refs/heads/master Commit: 16cdb61225d78c822566e33013162fa3e40fa279 Parents: f36aa6f Author: Maximilian Michels <[email protected]> Authored: Fri Jul 1 19:37:15 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Fri Jul 1 19:39:09 2016 +0200 ---------------------------------------------------------------------- .../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/16cdb612/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 08a55cd..641182e 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 @@ -622,8 +622,6 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor localResources.put(shipFile.getName(), shipResources); - classPathBuilder.append(ApplicationConstants.Environment.PWD.$()); - classPathBuilder.append(File.separator); classPathBuilder.append(shipFile.getName()); if (shipFile.isDirectory()) { // add directories to the classpath @@ -645,11 +643,9 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor localResources.put("flink-conf.yaml", flinkConf); paths.add(remotePathJar); - classPathBuilder.append(ApplicationConstants.Environment.PWD.$()).append(File.separator) - .append("flink.jar").append(File.pathSeparator); + classPathBuilder.append("flink.jar").append(File.pathSeparator); paths.add(remotePathConf); - classPathBuilder.append(ApplicationConstants.Environment.PWD.$()).append(File.separator) - .append("flink-conf.yaml").append(File.pathSeparator); + classPathBuilder.append("flink-conf.yaml").append(File.pathSeparator); sessionFilesDir = new Path(fs.getHomeDirectory(), ".flink/" + appId.toString() + "/");
