From dbf03e4087939754fe5d00b5aa9e54bbbbd0fc1d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 8 May 2014 10:35:45 -0700
Subject: [PATCH] CRAY - make job_container/cncu default when running on a Cray
natively
---
NEWS | 1 +
src/common/read_config.h | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index ba397d3d7ac..302772ba59a 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 27cc0ff315a..cfacd5698c3 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
--
GitLab