diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index 7b9873a..439dc0f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -27,6 +27,7 @@ import java.net.InetSocketAddress; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; @@ -64,6 +65,7 @@ import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.util.DiskChecker; +import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.YarnException; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ContainerId; @@ -479,18 +481,15 @@ LocalResourcesTracker getLocalResourcesTracker( } private String getUserFileCachePath(String user) { - String path = - "." + Path.SEPARATOR + ContainerLocalizer.USERCACHE + Path.SEPARATOR - + user + Path.SEPARATOR + ContainerLocalizer.FILECACHE; - return path; + return StringUtils.join(Path.SEPARATOR, Arrays.asList(".", + ContainerLocalizer.USERCACHE, user, ContainerLocalizer.FILECACHE)); + } private String getUserAppCachePath(String user, String appId) { - String path = - "." + Path.SEPARATOR + ContainerLocalizer.USERCACHE + Path.SEPARATOR - + user + Path.SEPARATOR + ContainerLocalizer.APPCACHE - + Path.SEPARATOR + appId; - return path; + return StringUtils.join(Path.SEPARATOR, Arrays.asList(".", + ContainerLocalizer.USERCACHE, user, ContainerLocalizer.APPCACHE, appId, + ContainerLocalizer.FILECACHE)); } /**