diff --git a/NEWS b/NEWS index ba397d3d7acf1073418d4858246719027a6da80d..302772ba59aa6ea84d845b1963cd208afbfc10c3 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ documents those changes that are of interest to users and admins. -- Correct logic to properly enforce job preemption GraceTime. -- Fix sinfo -R to print each down/drained node once, rather than once per partition. + -- CRAY - make job_container/cncu default when running on a Cray natively * Changes in Slurm 14.03.3-2 ============================ diff --git a/src/common/read_config.h b/src/common/read_config.h index 27cc0ff315a23f8ccbb4cc29b4903870fb4d2ef7..cfacd5698c35501fdcecfe7abd21b34bc61b693f 100644 --- a/src/common/read_config.h +++ b/src/common/read_config.h @@ -91,7 +91,11 @@ extern char *default_plugstack; #define DEFAULT_JOB_COMP_TYPE "jobcomp/none" #define DEFAULT_JOB_COMP_LOC "/var/log/slurm_jobcomp.log" #define DEFAULT_JOB_COMP_DB "slurm_jobcomp_db" -#define DEFAULT_JOB_CONTAINER_PLUGIN "job_container/none" +#if defined HAVE_NATIVE_CRAY +# define DEFAULT_JOB_CONTAINER_PLUGIN "job_container/cncu" +#else +# define DEFAULT_JOB_CONTAINER_PLUGIN "job_container/none" +#endif #define DEFAULT_KEEP_ALIVE_TIME ((uint16_t) NO_VAL) #define DEFAULT_KILL_ON_BAD_EXIT 0 #define DEFAULT_KILL_TREE 0