svn merge -r5645:5653 https://eris.llnl.gov/svn/slurm/branches/slurm-0-6-branch

NEWS

@@ -34,6 +34,8 @@ documents those changes that are of interest to users and admins.
 ========================
  -- Make proctrack/linuxproc thread safe, could cause slurmd seg fault.
  -- Propagate umask from srun to spawned tasks.
+ -- Fix problem in switch/elan error handling that could hang a slurmd 
+    step manager process.
 
 * Changes in SLURM 0.6.6
 ========================

src/plugins/switch/elan/qsw.c

@@ -1115,6 +1115,7 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
 		 */
 		if (elanctrl_open(&handle) != 0) {
 			slurm_seterrno(EELAN3CONTROL);
+			_prg_destructor_send(fd, -1);
 			goto fail;
 		}
 
@@ -1123,6 +1124,7 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
 			error("elanctrl_create_cap: %m");
 			slurm_seterrno(EELAN3CREATE);
 			/* elanctrl_close(handle); */
+			_prg_destructor_send(fd, -1);
 			goto fail;
 		}
 
@@ -1140,6 +1142,7 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
 		if ((ctx = elan3_control_open(i)) == NULL 
 				|| ctx == (void *)-1) {
 			slurm_seterrno(EELAN3CONTROL);
+			_prg_destructor_send(fd, -1);
 			goto fail;
 		}
 		
@@ -1151,6 +1154,7 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
 			 * which function failed? */
 		        error("elan3_create(%d): %m", i);
 			slurm_seterrno(EELAN3CREATE); 
+			_prg_destructor_send(fd, -1);
 			goto fail;
 		}
 	}