@@ -666,26 +666,20 @@ private void createDirsAndSetProperties() throws IOException {
666
666
new Path (root , "mapreduce-am-staging-root-dir" ).toString ());
667
667
668
668
// Frustrate yarn's and hdfs's attempts at writing /tmp.
669
- String property = "yarn.node-labels.fs-store.root-dir" ;
670
- createDirAndSetProperty (property , property );
671
- property = "yarn.nodemanager.log-dirs" ;
672
- createDirAndSetProperty (property , property );
673
- property = "yarn.nodemanager.remote-app-log-dir" ;
674
- createDirAndSetProperty (property , property );
675
- property = "yarn.timeline-service.entity-group-fs-store.active-dir" ;
676
- createDirAndSetProperty (property , property );
677
- property = "yarn.timeline-service.entity-group-fs-store.done-dir" ;
678
- createDirAndSetProperty (property , property );
679
- property = "yarn.nodemanager.remote-app-log-dir" ;
680
- createDirAndSetProperty (property , property );
681
- property = "dfs.journalnode.edits.dir" ;
682
- createDirAndSetProperty (property , property );
683
- property = "dfs.datanode.shared.file.descriptor.paths" ;
684
- createDirAndSetProperty (property , property );
685
- property = "nfs.dump.dir" ;
686
- createDirAndSetProperty (property , property );
687
- property = "java.io.tmpdir" ;
688
- createDirAndSetProperty (property , property );
669
+ // Below is fragile. Make it so we just interpolate any 'tmp' reference.
670
+ createDirAndSetProperty ("yarn.node-labels.fs-store.root-dir" );
671
+ createDirAndSetProperty ("yarn.nodemanager.log-dirs" );
672
+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
673
+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.active-dir" );
674
+ createDirAndSetProperty ("yarn.timeline-service.entity-group-fs-store.done-dir" );
675
+ createDirAndSetProperty ("yarn.nodemanager.remote-app-log-dir" );
676
+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
677
+ createDirAndSetProperty ("dfs.datanode.shared.file.descriptor.paths" );
678
+ createDirAndSetProperty ("nfs.dump.dir" );
679
+ createDirAndSetProperty ("java.io.tmpdir" );
680
+ createDirAndSetProperty ("java.io.tmpdir" );
681
+ createDirAndSetProperty ("dfs.journalnode.edits.dir" );
682
+ createDirAndSetProperty ("dfs.provided.aliasmap.inmemory.leveldb.dir" );
689
683
}
690
684
691
685
/**
@@ -734,6 +728,10 @@ private void enableShortCircuit() {
734
728
}
735
729
}
736
730
731
+ private String createDirAndSetProperty (String relPath , String property ) {
732
+ return createDirAndSetProperty (property , property );
733
+ }
734
+
737
735
private String createDirAndSetProperty (final String relPath , String property ) {
738
736
String path = getDataTestDir (relPath ).toString ();
739
737
System .setProperty (property , path );
0 commit comments