@@ -729,26 +729,20 @@ private void createDirsAndSetProperties() throws IOException {
729729 new Path (root , "mapreduce-am-staging-root-dir" ).toString ());
730730
731731 // Frustrate yarn's and hdfs's attempts at writing /tmp.
732- String property = "yarn.node-labels.fs-store.root-dir" ;
733- createDirAndSetProperty (property , property );
734- property = "yarn.nodemanager.log-dirs" ;
735- createDirAndSetProperty (property , property );
736- property = "yarn.nodemanager.remote-app-log-dir" ;
737- createDirAndSetProperty (property , property );
738- property = "yarn.timeline-service.entity-group-fs-store.active-dir" ;
739- createDirAndSetProperty (property , property );
740- property = "yarn.timeline-service.entity-group-fs-store.done-dir" ;
741- createDirAndSetProperty (property , property );
742- property = "yarn.nodemanager.remote-app-log-dir" ;
743- createDirAndSetProperty (property , property );
744- property = "dfs.journalnode.edits.dir" ;
745- createDirAndSetProperty (property , property );
746- property = "dfs.datanode.shared.file.descriptor.paths" ;
747- createDirAndSetProperty (property , property );
748- property = "nfs.dump.dir" ;
749- createDirAndSetProperty (property , property );
750- property = "java.io.tmpdir" ;
751- createDirAndSetProperty (property , property );
732+ // Below is fragile. Make it so we just interpolate any 'tmp' reference.
733+ createDirAndSetProperty ("yarn.node-labels.fs-store.root-dir" );
734+ createDirAndSetProperty ("yarn.nodemanager.log-dirs" );
735+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
736+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.active-dir" );
737+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.done-dir" );
738+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
739+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
740+ createDirAndSetProperty ("dfs.datanode.shared.file.descriptor.paths" );
741+ createDirAndSetProperty ("nfs.dump.dir" );
742+ createDirAndSetProperty ("java.io.tmpdir" );
743+ createDirAndSetProperty ("java.io.tmpdir" );
744+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
745+ createDirAndSetProperty ("dfs.provided.aliasmap.inmemory.leveldb.dir" );
752746 }
753747
754748 /**
@@ -797,6 +791,10 @@ private void enableShortCircuit() {
797791 }
798792 }
799793
794+ private String createDirAndSetProperty (String relPath , String property ) {
795+ return createDirAndSetProperty (property , property );
796+ }
797+
800798 private String createDirAndSetProperty (final String relPath , String property ) {
801799 String path = getDataTestDir (relPath ).toString ();
802800 System .setProperty (property , path );
0 commit comments