You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/07/18 11:51:52 UTC
flink git commit: [FLINK-9793][yarn] Fix flink-dist detection to
prevent duplicate upload
Repository: flink
Updated Branches:
refs/heads/master d6c069d2c -> 2ec72123e
[FLINK-9793][yarn] Fix flink-dist detection to prevent duplicate upload
This closes #6296.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2ec72123
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2ec72123
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2ec72123
Branch: refs/heads/master
Commit: 2ec72123e347e684ac40a1e1111a79a11211aadb
Parents: d6c069d
Author: linjun <14...@qq.com>
Authored: Tue Jul 10 22:55:11 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 18 13:51:28 2018 +0200
----------------------------------------------------------------------
.../org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2ec72123/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 089d825..c3ad9f7 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
@@ -1189,9 +1189,9 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor
@Override
public FileVisitResult visitFile(java.nio.file.Path file, BasicFileAttributes attrs)
throws IOException {
-
- if (!(file.getFileName().startsWith("flink-dist") &&
- file.getFileName().endsWith("jar"))) {
+ String fileName = file.getFileName().toString();
+ if (!(fileName.startsWith("flink-dist") &&
+ fileName.endsWith("jar"))) {
java.nio.file.Path relativePath = parentPath.relativize(file);