Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-7905. Parent directory permission incorrect during public localization. Contributed by Bilwa S T. 

(cherry picked from commit eb47c3de74)
This commit is contained in:
bibinchundatt 2018-04-07 12:13:00 +05:30
parent c3d8eda9bd
commit 952bb0f371
2 changed files with 145 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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 Normal file → Executable file
View File

@ -152,6 +152,8 @@ public class ResourceLocalizationService extends CompositeService
LoggerFactory.getLogger(ResourceLocalizationService.class);
public static final String NM_PRIVATE_DIR = "nmPrivate";
public static final FsPermission NM_PRIVATE_PERM = new FsPermission((short) 0700);
private static final FsPermission PUBLIC_FILECACHE_FOLDER_PERMS =
new FsPermission((short) 0755);
private Server server;
private InetSocketAddress localizationServerAddress;
@ -881,6 +883,7 @@ public class ResourceLocalizationService extends CompositeService
publicRsrc.getPathForLocalization(key, publicRootPath,
delService);
if (!publicDirDestPath.getParent().equals(publicRootPath)) {
createParentDirs(publicDirDestPath, publicRootPath);
if (diskValidator != null) {
diskValidator.checkStatus(
new File(publicDirDestPath.toUri().getPath()));
@ -932,6 +935,23 @@ public class ResourceLocalizationService extends CompositeService
}
}
private void createParentDirs(Path destDirPath, Path destDirRoot)
throws IOException {
if (destDirPath == null || destDirPath.equals(destDirRoot)) {
return;
}
createParentDirs(destDirPath.getParent(), destDirRoot);
createDir(destDirPath, PUBLIC_FILECACHE_FOLDER_PERMS);
}
private void createDir(Path dirPath, FsPermission perms)
throws IOException {
lfs.mkdir(dirPath, perms, false);
if (!perms.equals(perms.applyUMask(lfs.getUMask()))) {
lfs.setPermission(dirPath, perms);
}
}
@Override
public void run() {
try {

125
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java Normal file → Executable file
View File

@ -78,6 +78,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FSError;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
@ -1533,6 +1534,103 @@ public class TestResourceLocalizationService {
}
}
@Test
@SuppressWarnings("unchecked")
public void testPublicCacheDirPermission() throws Exception {
// Setup state to simulate restart NM with existing state meaning no
// directory creation during initialization
NMStateStoreService spyStateStore = spy(nmContext.getNMStateStore());
when(spyStateStore.canRecover()).thenReturn(true);
NMContext spyContext = spy(nmContext);
when(spyContext.getNMStateStore()).thenReturn(spyStateStore);
Path localDir = new Path("target", "testPublicCacheDirPermission");
String sDir = lfs.makeQualified(localDir).toString();
conf.setStrings(YarnConfiguration.NM_LOCAL_DIRS, sDir);
conf.setInt(YarnConfiguration.NM_LOCAL_CACHE_MAX_FILES_PER_DIRECTORY, 38);
DrainDispatcher dispatcher = new DrainDispatcher();
EventHandler<ApplicationEvent> applicationBus = mock(EventHandler.class);
dispatcher.register(ApplicationEventType.class, applicationBus);
EventHandler<ContainerEvent> containerBus = mock(EventHandler.class);
dispatcher.register(ContainerEventType.class, containerBus);
ContainerExecutor exec = mock(ContainerExecutor.class);
DeletionService delService = mock(DeletionService.class);
LocalDirsHandlerService dirsHandler = new LocalDirsHandlerService();
dirsHandler.init(conf);
dispatcher.init(conf);
dispatcher.start();
try {
ResourceLocalizationService rawService = new ResourceLocalizationService(
dispatcher, exec, delService, dirsHandler, spyContext, null);
ResourceLocalizationService spyService = spy(rawService);
doReturn(mockServer).when(spyService).createServer();
doReturn(lfs).when(spyService)
.getLocalFileContext(isA(Configuration.class));
spyService.init(conf);
spyService.start();
final FsPermission expectedPerm = new FsPermission((short) 0755);
Path publicCache = new Path(localDir, ContainerLocalizer.FILECACHE);
FsPermission wrongPerm = new FsPermission((short) 0700);
Path overflowFolder = new Path(publicCache, "0");
lfs.mkdir(overflowFolder, wrongPerm, false);
spyService.lfs.setUMask(new FsPermission((short) 0777));
final String user = "user0";
// init application
final Application app = mock(Application.class);
final ApplicationId appId = BuilderUtils
.newApplicationId(314159265358979L, 3);
when(app.getUser()).thenReturn(user);
when(app.getAppId()).thenReturn(appId);
spyService.handle(new ApplicationLocalizationEvent(
LocalizationEventType.INIT_APPLICATION_RESOURCES, app));
dispatcher.await();
// init container.
final Container c = getMockContainer(appId, 42, user);
// init resources
Random r = new Random();
long seed = r.nextLong();
System.out.println("SEED: " + seed);
r.setSeed(seed);
Set<LocalResourceRequest> pubRsrcs = new HashSet<LocalResourceRequest>();
for (int i = 0; i < 3; i++) {
LocalResource pubResource = getPublicMockedResource(r, true, conf,
sDir);
LocalResourceRequest pubReq = new LocalResourceRequest(pubResource);
pubRsrcs.add(pubReq);
}
Map<LocalResourceVisibility, Collection<LocalResourceRequest>> req =
new HashMap<LocalResourceVisibility,
Collection<LocalResourceRequest>>();
req.put(LocalResourceVisibility.PUBLIC, pubRsrcs);
spyService.handle(new ContainerLocalizationRequestEvent(c, req));
dispatcher.await();
// verify directory creation
Assert.assertEquals(
"Cache directory permissions filecache/0 is incorrect", expectedPerm,
lfs.getFileStatus(overflowFolder).getPermission());
} finally {
dispatcher.stop();
}
}
@Test(timeout = 20000)
@SuppressWarnings("unchecked")
public void testLocalizerHeartbeatWhenAppCleaningUp() throws Exception {
@ -2488,10 +2586,37 @@ public class TestResourceLocalizationService {
r.nextInt(1024) + 1024L, r.nextInt(1024) + 2048L, false);
return rsrc;
}
private static LocalResource getMockedResource(Random r,
LocalResourceVisibility vis, boolean create, Configuration conf,
String path) {
String name = Long.toHexString(r.nextLong());
Path newpath = new Path(path + "/local", name);
File file = new File(
Path.getPathWithoutSchemeAndAuthority(newpath).toString());
try {
FileSystem.create(FileSystem.get(conf), newpath,
new FsPermission((short) 0755));
file.deleteOnExit();
} catch (IOException e) {
// Failed to create test resource
e.printStackTrace();
}
LocalResource mockedResource = BuilderUtils.newLocalResource(
URL.fromPath(newpath), LocalResourceType.FILE, vis,
file.getTotalSpace(), file.lastModified(), false);
return mockedResource;
}
private static LocalResource getAppMockedResource(Random r) {
return getMockedResource(r, LocalResourceVisibility.APPLICATION);
}
private static LocalResource getPublicMockedResource(Random r, boolean create,
Configuration conf, String path) {
return getMockedResource(r, LocalResourceVisibility.PUBLIC, create, conf,
path);
}
private static LocalResource getPublicMockedResource(Random r) {
return getMockedResource(r, LocalResourceVisibility.PUBLIC);