YARN-2682. Updated WindowsSecureContainerExecutor to not use DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir() instead. Contributed by Zhihai Xu
This commit is contained in:
parent
b0d6ac92fe
commit
0fd0ebae64
@ -360,6 +360,10 @@ Release 2.6.0 - UNRELEASED
|
||||
YARN-2621. Simplify the output when the user doesn't have the access for
|
||||
getDomain(s). (Zhijie Shen via jianhe)
|
||||
|
||||
YARN-2682. Updated WindowsSecureContainerExecutor to not use
|
||||
DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir()
|
||||
instead. (Zhihai Xu via jianhe)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
@ -462,11 +462,6 @@ public void deleteAsUser(String user, Path subDir, Path... baseDirs)
|
||||
* $logdir/$user/$appId */
|
||||
static final short LOGDIR_PERM = (short)0710;
|
||||
|
||||
protected Path getFirstApplicationDir(List<String> localDirs, String user,
|
||||
String appId) {
|
||||
return getApplicationDir(new Path(localDirs.get(0)), user, appId);
|
||||
}
|
||||
|
||||
private long getDiskFreeSpace(Path base) throws IOException {
|
||||
return lfs.getFsStatus(base).getRemaining();
|
||||
}
|
||||
@ -489,7 +484,7 @@ private Path getFileCacheDir(Path base, String user) {
|
||||
ContainerLocalizer.FILECACHE);
|
||||
}
|
||||
|
||||
private Path getWorkingDir(List<String> localDirs, String user,
|
||||
protected Path getWorkingDir(List<String> localDirs, String user,
|
||||
String appId) throws IOException {
|
||||
Path appStorageDir = null;
|
||||
long totalAvailable = 0L;
|
||||
|
@ -115,9 +115,8 @@ public void startLocalizer(Path nmPrivateContainerTokens,
|
||||
createUserCacheDirs(localDirs, user);
|
||||
createAppDirs(localDirs, user, appId);
|
||||
createAppLogDirs(appId, logDirs, user);
|
||||
|
||||
// TODO: Why pick first app dir. The same in LCE why not random?
|
||||
Path appStorageDir = getFirstApplicationDir(localDirs, user, appId);
|
||||
|
||||
Path appStorageDir = getWorkingDir(localDirs, user, appId);
|
||||
|
||||
String tokenFn = String.format(ContainerLocalizer.TOKEN_FILE_NAME_FMT, locId);
|
||||
Path tokenDst = new Path(appStorageDir, tokenFn);
|
||||
|
Loading…
Reference in New Issue
Block a user