Add 2.7.2 NEWS entry

[ganeti-local] / man / ganeti-masterd.rst

diff --git a/man/ganeti-masterd.rst b/man/ganeti-masterd.rst
index 34fad8d..2502d65 100644 (file)
--- a/man/ganeti-masterd.rst
+++ b/man/ganeti-masterd.rst
@@ -9,7 +9,7 @@ ganeti-masterd - Ganeti master daemon
 Synopsis
 --------
 
-**ganeti-masterd** [-f] [-d] [--no-voting]
+**ganeti-masterd** [-f] [-d] [\--no-voting]
 
 DESCRIPTION
 -----------
@@ -55,6 +55,18 @@ skip this process. The option requires interactive confirmation, as
 having two masters on the same cluster is a very dangerous
 situation and will most likely lead to data loss.
 
+SHUTDOWN
+~~~~~~~~
+
+When the master daemon receives a ``SIGINT`` (Ctrl-C) or ``SIGTERM``
+signal, it stops accepting new jobs and prepares to shut down shortly
+after jobs running at the time finish. Meanwhile it still responds to
+LUXI requests. Pending jobs are re-queued after the daemon is started
+again. When a second signal is received, the master daemon terminates
+without waiting (it might still need to wait for some threads to
+finish). Note that the latter, as well as sending ``SIGKILL``, may leave
+the cluster in an inconsistent state.
+
 JOB QUEUE
 ~~~~~~~~~
 
@@ -76,3 +88,9 @@ COMMUNICATION PROTOCOL
 The master accepts commands over a Unix socket, using JSON
 serialized messages separated by a specific byte sequence. For more
 details, see the design documentation supplied with Ganeti.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End: