@@ -723,26 +723,20 @@ private void createDirsAndSetProperties() throws IOException {
723723 new Path (root , "mapreduce-am-staging-root-dir" ).toString ());
724724
725725 // Frustrate yarn's and hdfs's attempts at writing /tmp.
726- String property = "yarn.node-labels.fs-store.root-dir" ;
727- createDirAndSetProperty (property , property );
728- property = "yarn.nodemanager.log-dirs" ;
729- createDirAndSetProperty (property , property );
730- property = "yarn.nodemanager.remote-app-log-dir" ;
731- createDirAndSetProperty (property , property );
732- property = "yarn.timeline-service.entity-group-fs-store.active-dir" ;
733- createDirAndSetProperty (property , property );
734- property = "yarn.timeline-service.entity-group-fs-store.done-dir" ;
735- createDirAndSetProperty (property , property );
736- property = "yarn.nodemanager.remote-app-log-dir" ;
737- createDirAndSetProperty (property , property );
738- property = "dfs.journalnode.edits.dir" ;
739- createDirAndSetProperty (property , property );
740- property = "dfs.datanode.shared.file.descriptor.paths" ;
741- createDirAndSetProperty (property , property );
742- property = "nfs.dump.dir" ;
743- createDirAndSetProperty (property , property );
744- property = "java.io.tmpdir" ;
745- createDirAndSetProperty (property , property );
726+ // Below is fragile. Make it so we just interpolate any 'tmp' reference.
727+ createDirAndSetProperty ("yarn.node-labels.fs-store.root-dir" );
728+ createDirAndSetProperty ("yarn.nodemanager.log-dirs" );
729+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
730+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.active-dir" );
731+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.done-dir" );
732+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
733+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
734+ createDirAndSetProperty ("dfs.datanode.shared.file.descriptor.paths" );
735+ createDirAndSetProperty ("nfs.dump.dir" );
736+ createDirAndSetProperty ("java.io.tmpdir" );
737+ createDirAndSetProperty ("java.io.tmpdir" );
738+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
739+ createDirAndSetProperty ("dfs.provided.aliasmap.inmemory.leveldb.dir" );
746740 }
747741
748742 /**
@@ -791,6 +785,10 @@ private void enableShortCircuit() {
791785 }
792786 }
793787
788+ private String createDirAndSetProperty (String relPath , String property ) {
789+ return createDirAndSetProperty (property , property );
790+ }
791+
794792 private String createDirAndSetProperty (final String relPath , String property ) {
795793 String path = getDataTestDir (relPath ).toString ();
796794 System .setProperty (property , path );
0 commit comments