Skip to content

Fix the session directory cleanup - only remove the jobfam session di… #2510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2016
Merged

Fix the session directory cleanup - only remove the jobfam session di… #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions contrib/scaling/scaling.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# globals
my $num_nodes = 2;
my $my_arg;
my $reps = 1;
my $reps = 5;
my $usedvm = 0;
my $usesrun = 0;
my $usempirun = 0;
Expand All @@ -19,14 +19,14 @@
my $myapp;
my $runall = 0;
my $rawoutput = 0;
my $myresults;
my $myresults = "myresults";
my @csvrow;

my @tests = qw(/bin/true ./orte_no_op ./mpi_no_op ./mpi_no_op ./mpi_no_op);
my @options = ("", "", "", "-mca mpi_add_procs_cutoff 0 -mca pmix_base_async_modex 1", "-mca mpi_add_procs_cutoff 0 -mca pmix_base_async_modex 1 -mca async_mpi_init 1 -mca async_mpi_finalize 1");
my @starters = qw(mpirun orterun srun aprun);
my @starteroptions = ("-npernode 1 --novm",
"--hnp file:dvm_uri -pernode",
my @starteroptions = ("--map-by node --novm",
"--hnp file:dvm_uri --map-by node",
"--distribution=cyclic",
"-N 1");

Expand Down Expand Up @@ -276,7 +276,9 @@ ()
system("rm -f dvm_uri");
}
$cmd = "orte-dvm --report-uri dvm_uri 2>&1 &";
print $cmd . "\n";
if ($myresults) {
print FILE "\n\n$cmd\n";
}
if (!$SHOWME) {
system($cmd);
# wait for the rendezvous file to appear
Expand All @@ -288,14 +290,14 @@ ()
}

if ($myresults) {
print FILE "\n\n$starter\n\n";
print FILE "$starter\n\n";
}
my $testnum = 0;
foreach $test (@tests) {
$option = $options[$testnum];
if (-e $test) {
if ($myresults) {
print FILE "#nodes,$test\n";
print FILE "#nodes,$test,$option\n";
}
if (!$SHOWME) {
# pre-position the executable
Expand Down Expand Up @@ -341,4 +343,3 @@ ()
if ($myresults) {
close(FILE);
}

10 changes: 8 additions & 2 deletions orte/util/session_dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,14 @@ orte_session_dir_finalize(orte_process_name_t *proc)
false, orte_dir_check_file);
opal_os_dirpath_destroy(orte_process_info.job_session_dir,
false, orte_dir_check_file);
opal_os_dirpath_destroy(orte_process_info.jobfam_session_dir,
false, orte_dir_check_file);
/* only remove the jobfam session dir if we are the
* local daemon and we are finalizing our own session dir */
if ((ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) &&
(ORTE_PROC_MY_NAME == proc)) {
opal_os_dirpath_destroy(orte_process_info.jobfam_session_dir,
false, orte_dir_check_file);
}

if( NULL != orte_process_info.top_session_dir ){
opal_os_dirpath_destroy(orte_process_info.top_session_dir,
false, orte_dir_check_file);
Expand Down