From 845a7925d70a8a75718da3c194d6510057c62882 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 11 Mar 2013 15:01:39 -0700
Subject: [PATCH] Add support for SALLOC_RESERVATION and SLURM_RESERVATION for
salloc and srun
This permits default reservation names to be more easily managed
---
doc/man/man1/salloc.1 | 3 +++
doc/man/man1/srun.1 | 3 +++
src/salloc/opt.c | 1 +
src/srun/libsrun/opt.c | 1 +
4 files changed, 8 insertions(+)
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 67de346fb73..44a947cf5af 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -1234,6 +1234,9 @@ Same as \fB\-p, \-\-partition\fR
\fBSALLOC_QOS\fR
Same as \fB\-\-qos\fR
.TP
+\fBSALLOC_RESERVATION\fR
+Same as \fB\-\-reservation\fR
+.TP
\fBSALLOC_SIGNAL\fR
Same as \fB\-\-signal\fR
.TP
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index a5b1781baac..d91f886f6f2 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1815,6 +1815,9 @@ Same as \fB\-\-qos\fR
\fBSLURM_REMOTE_CWD\fR
Same as \fB\-D, \-\-chdir=\fR
.TP
+\fBSLURM_RESERVATION\fR
+Same as \fB\-\-reservation\fR
+.TP
\fBSLURM_RESTART_DIR\fR
Same as \fB\-\-restart\-dir\fR
.TP
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 1120c3bcabd..c2aa64f86b2 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -400,6 +400,7 @@ env_vars_t env_vars[] = {
{"SALLOC_OVERCOMMIT", OPT_OVERCOMMIT, NULL, NULL },
{"SALLOC_PARTITION", OPT_STRING, &opt.partition, NULL },
{"SALLOC_QOS", OPT_STRING, &opt.qos, NULL },
+ {"SALLOC_RESERVATION", OPT_STRING, &opt.reservation, NULL },
{"SALLOC_SIGNAL", OPT_SIGNAL, NULL, NULL },
{"SALLOC_TIMELIMIT", OPT_STRING, &opt.time_limit_str,NULL },
{"SALLOC_WAIT", OPT_IMMEDIATE, NULL, NULL },
diff --git a/src/srun/libsrun/opt.c b/src/srun/libsrun/opt.c
index 7f77fe16a29..cef24799a6c 100644
--- a/src/srun/libsrun/opt.c
+++ b/src/srun/libsrun/opt.c
@@ -543,6 +543,7 @@ env_vars_t env_vars[] = {
{"SLURM_QOS", OPT_STRING, &opt.qos, NULL },
{"SLURM_RAMDISK_IMAGE", OPT_STRING, &opt.ramdiskimage, NULL },
{"SLURM_REMOTE_CWD", OPT_STRING, &opt.cwd, NULL },
+{"SLURM_RESERVATION", OPT_STRING, &opt.reservation, NULL },
{"SLURM_RESTART_DIR", OPT_STRING, &opt.restart_dir , NULL },
{"SLURM_RESV_PORTS", OPT_RESV_PORTS, NULL, NULL },
{"SLURM_SIGNAL", OPT_SIGNAL, NULL, NULL },
--
GitLab