Skip to content
Snippets Groups Projects
Commit d16c9d8c authored by tewk's avatar tewk
Browse files

Changed exits to returns, this should fix slurmd dying problems

parent 9d0fc050
No related branches found
No related tags found
No related merge requests found
...@@ -43,27 +43,27 @@ int interconnect_init ( launch_tasks_request_msg_t * launch_msg ) ...@@ -43,27 +43,27 @@ int interconnect_init ( launch_tasks_request_msg_t * launch_msg )
{ {
case -1: case -1:
slurm_perror("fork"); slurm_perror("fork");
exit(1); return SLURM_ERROR ;
case 0: /* child falls thru */ case 0: /* child falls thru */
break; break;
default: /* parent */ default: /* parent */
if (waitpid(pid, NULL, 0) < 0) if (waitpid(pid, NULL, 0) < 0)
{ {
slurm_perror("wait"); slurm_perror("wait");
exit(1); return SLURM_ERROR ;
} }
if (qsw_prgdestroy( launch_msg -> qsw_job ) < 0) { if (qsw_prgdestroy( launch_msg -> qsw_job ) < 0) {
slurm_perror("qsw_prgdestroy"); slurm_perror("qsw_prgdestroy");
exit(1); return SLURM_ERROR ;
} }
exit(0); return SLURM_SUCCESS ;
} }
/* Process 2: */ /* Process 2: */
if (qsw_prog_init(launch_msg -> qsw_job , launch_msg -> uid) < 0) if (qsw_prog_init(launch_msg -> qsw_job , launch_msg -> uid) < 0)
{ {
slurm_perror("qsw_prog_init"); slurm_perror("qsw_prog_init");
exit(1); return SLURM_ERROR ;
} }
return fan_out_task_launch ( launch_msg ) ; return fan_out_task_launch ( launch_msg ) ;
...@@ -78,18 +78,18 @@ int interconnect_set_capabilities ( task_start_t * task_start ) ...@@ -78,18 +78,18 @@ int interconnect_set_capabilities ( task_start_t * task_start )
if (qsw_setcap( task_start -> launch_msg -> qsw_job, i) < 0) { if (qsw_setcap( task_start -> launch_msg -> qsw_job, i) < 0) {
slurm_perror("qsw_setcap"); slurm_perror("qsw_setcap");
exit(1); return SLURM_ERROR ;
} }
if (do_env(i, nodeid, nprocs) < 0) { if (do_env(i, nodeid, nprocs) < 0) {
slurm_perror("do_env"); slurm_perror("do_env");
exit(1); return SLURM_ERROR ;
} }
pid = fork(); pid = fork();
switch (pid) { switch (pid) {
case -1: /* error */ case -1: /* error */
slurm_perror("fork"); slurm_perror("fork");
exit(1); return SLURM_ERROR ;
case 0: /* child falls thru */ case 0: /* child falls thru */
return SLURM_SUCCESS ; return SLURM_SUCCESS ;
break; break;
...@@ -97,9 +97,9 @@ int interconnect_set_capabilities ( task_start_t * task_start ) ...@@ -97,9 +97,9 @@ int interconnect_set_capabilities ( task_start_t * task_start )
if (waitpid(pid, NULL, 0) < 0) if (waitpid(pid, NULL, 0) < 0)
{ {
slurm_perror("waitpid"); slurm_perror("waitpid");
exit(1); return SLURM_ERROR ;
} }
exit(0); return SLURM_SUCCESS ;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment