From ed84b5fe98e76748dd7d5e3771bd237f806102f9 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 7 Nov 2012 08:23:40 -0800
Subject: [PATCH] Cray - Document signal handling with respect to ALPS
 reservations

---
 doc/html/cray.shtml    | 9 ++++++++-
 doc/man/man1/scancel.1 | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/html/cray.shtml b/doc/html/cray.shtml
index 10a4e8a9b23..7adc8c81a7f 100644
--- a/doc/html/cray.shtml
+++ b/doc/html/cray.shtml
@@ -154,6 +154,13 @@ file.  This option is set with RPMs from Cray.</p>
 <p>Cray/ALPS node ordering is a topic of ongoing work, some information can be found in the CUG-2010 paper
    "<i>ALPS, Topology, and Performance</i>" by Carl Albing and Mark Baker.</p>
 
+<h3>The scancel command and signalling jobs</h3>
+On Cray systems, all signals <b>except</b>
+SIGCHLD, SIGCONT, SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, or SIGWINCH
+cause the ALPS reservation to be released.
+The job however will not be terminated except in the case of SIGKILL and
+may then be used for post processing.
+
 <h3>GPU Use</h3>
 
 <p>Users may specify GPU memory required per node using the <i>--gres=gpu_mem:#</i>
@@ -642,6 +649,6 @@ allocation.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 18 September 2012</p></td>
+<p style="text-align:center;">Last modified 7 November 2012</p></td>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/man/man1/scancel.1 b/doc/man/man1/scancel.1
index d99194564b1..9bac0d7de3e 100644
--- a/doc/man/man1/scancel.1
+++ b/doc/man/man1/scancel.1
@@ -1,4 +1,4 @@
-.TH SCANCEL "1" "January 2011" "scancel 2.3" "Slurm components"
+.TH SCANCEL "1" "November 2012" "scancel 2.5" "Slurm components"
 
 .SH "NAME"
 scancel \- Used to signal jobs or job steps that are under the control of Slurm.
@@ -190,6 +190,12 @@ time for the running job/step(s) to clean up.
 .LP
 If a signal value of "KILL" is sent to an entire job, this will cancel
 the active job steps but not cancel the job itself.
+.LP
+On Cray systems, all signals \fBexcept\fR
+SIGCHLD, SIGCONT, SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, or SIGWINCH
+cause the ALPS reservation to be released.
+The job however will not be terminated except in the case of SIGKILL and
+may then be used for post processing.
 
 .SH "AUTHORIZATION"
 
-- 
GitLab