diff --git a/src/plugins/select/cray/basil_interface.c b/src/plugins/select/cray/basil_interface.c index 43fb3c6a8f1aaacaddcf690671e4b6cba0e7f716..6336e90425c026aeee4a2525ea8ff6591b952d19 100644 --- a/src/plugins/select/cray/basil_interface.c +++ b/src/plugins/select/cray/basil_interface.c @@ -745,9 +745,8 @@ extern int do_basil_confirm(struct job_record *job_ptr) rc = basil_confirm(resv_id, job_ptr->job_id, pagg_id); if (rc == 0) { - debug2("confirmed ALPS resId %u for JobId %u, " - "pagg %"PRIu64"", - resv_id, job_ptr->job_id, pagg_id); + debug2("confirmed ALPS resId %u for JobId %u, pagg " + "%"PRIu64"", resv_id, job_ptr->job_id, pagg_id); return SLURM_SUCCESS; } else if (rc == -BE_NO_RESID) { /* diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray/select_cray.c index 035cb6e0449d8df837903f50827be77d59ce7f1e..ab184cfe3d6b44273204396a33851c3e5c0775f0 100644 --- a/src/plugins/select/cray/select_cray.c +++ b/src/plugins/select/cray/select_cray.c @@ -139,7 +139,7 @@ extern int init ( void ) /* * FIXME: At the moment the smallest Cray allocation unit are still * full nodes. Node sharing (even across NUMA sockets of the same - * node) is, as of CLE 3.1 (summer 2010) still not supported, i.e. + * node) is, as of CLE 3.x (Summer 2011) still not supported, i.e. * as per the LIMITATIONS section of the aprun(1) manpage of the * 3.1.27A release). * Hence for the moment we can only use select/linear. If some diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c index e46de1977d4efb03dda7bac679a4c5902fbdc25d..f5cc171db75ebc607cae420a30f0545f5e291385 100644 --- a/src/slurmd/slurmstepd/mgr.c +++ b/src/slurmd/slurmstepd/mgr.c @@ -277,7 +277,6 @@ static int _call_select_plugin_from_stepd(slurmd_job_t *job, uint64_t pagg_id, fake_job_record.job_id = job->jobid; fake_job_record.job_state = (uint16_t)NO_VAL; - fake_job_record.alloc_sid = getsid(0); fake_job_record.select_jobinfo = select_g_select_jobinfo_alloc(); select_g_select_jobinfo_set(fake_job_record.select_jobinfo, SELECT_JOBDATA_RESV_ID, &job->resv_id);