aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-17 16:30:25 +0100
committerSiri Hansen <[email protected]>2011-11-17 16:30:25 +0100
commit1c995165c752468c5c49f84b0c1bae7991cde008 (patch)
tree3fc69294087e7672c5bfd1025467b165141c5229 /lib/kernel/doc/src
parent80775f1e41a38a617f779bc14736d8b281c12839 (diff)
parent77ffc0d747f913c47d9e5305907a407d87883ba2 (diff)
downloadotp-1c995165c752468c5c49f84b0c1bae7991cde008.tar.gz
otp-1c995165c752468c5c49f84b0c1bae7991cde008.tar.bz2
otp-1c995165c752468c5c49f84b0c1bae7991cde008.zip
Merge branch 'siri/kernel/application-shutdown-timeout/OTP-9540'
* siri/kernel/application-shutdown-timeout/OTP-9540: Add documentation and test for kernel env var shutdown_timeout Add env var shutdown_timeout to kernel to avoid deadlock on node shutdown
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/kernel_app.xml11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index bf513b7815..0f71a4f0f2 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
<appref>
<header>
<copyright>
- <year>1996</year><year>2009</year>
+ <year>1996</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -231,6 +231,15 @@ MaxT = TickTime + TickTime / 4</code>
<p><em>Note:</em> Normally, a terminating node is detected
immediately.</p>
</item>
+ <tag><c>shutdown_timeout = integer() | infinity</c></tag>
+ <item>
+ <p>Specifies the time <c>application_controller</c> will wait
+ for an application to terminate during node shutdown. If the
+ timer expires, <c>application_controller</c> will brutally
+ kill <c>application_master</c> of the hanging
+ application. If this parameter is undefined, it defaults
+ to <c>infinity</c>.</p>
+ </item>
<tag><c>sync_nodes_mandatory = [NodeName]</c></tag>
<item>
<p>Specifies which other nodes <em>must</em> be alive in order