From cbcceb0625e416650de043fab0ea0ee0e9fe8995 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 7 Jul 2022 15:27:40 -0500 Subject: [PATCH 1/2] docs: upgrade guide for client max_kill_timeout --- website/content/docs/upgrade/upgrade-specific.mdx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/content/docs/upgrade/upgrade-specific.mdx b/website/content/docs/upgrade/upgrade-specific.mdx index c1cc40164..6bb5dd199 100644 --- a/website/content/docs/upgrade/upgrade-specific.mdx +++ b/website/content/docs/upgrade/upgrade-specific.mdx @@ -32,6 +32,13 @@ to version 3, and in Nomad 1.4.0 Nomad requires the use of raft protocol version 3. If [`raft_protocol`] version is explicitly set, it must now be set to `3`. For more information see the [Upgrading to Raft Protocol 3] guide. +#### Client `max_kill_timeout` now enforced + +Nomad versions since v0.9 have incorrectly ignored the Client [`max_kill_timeout`][max_kill_timeout] +configuration option. This bug has been fixed in Nomad versions v1.4.0, v.1.3.2, +v1.2.9, and v1.1.15. Job submitters should be aware that a Task's [`kill_timeout`][kill_timeout] +will be reduced to the Client's `max_kill_timeout` if the value exceeds the maximum. + ## Nomad 1.3.1, 1.2.8, 1.1.14 #### Default `artifact` limits @@ -1447,3 +1454,5 @@ deleted and then Nomad 0.3.0 can be launched. [`Local`]: https://www.consul.io/docs/security/acl/acl-tokens#token-attributes [anon_token]: https://www.consul.io/docs/security/acl/acl-tokens#special-purpose-tokens [consul_acl]: https://github.com/hashicorp/consul/issues/7414 +[kill_timeout]: /docs/job-specification/task#kill_timeout +[max_kill_timeout]: /docs/configuration/client#max_kill_timeout \ No newline at end of file From 64f35f9cf37629ba4252aa8b1f66c0d2f87f3590 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 7 Jul 2022 16:46:26 -0500 Subject: [PATCH 2/2] docs: move upgrade docs for max_client_timeout Co-authored-by: Luiz Aoqui --- website/content/docs/upgrade/upgrade-specific.mdx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/content/docs/upgrade/upgrade-specific.mdx b/website/content/docs/upgrade/upgrade-specific.mdx index 6bb5dd199..2e97064ab 100644 --- a/website/content/docs/upgrade/upgrade-specific.mdx +++ b/website/content/docs/upgrade/upgrade-specific.mdx @@ -32,10 +32,12 @@ to version 3, and in Nomad 1.4.0 Nomad requires the use of raft protocol version 3. If [`raft_protocol`] version is explicitly set, it must now be set to `3`. For more information see the [Upgrading to Raft Protocol 3] guide. +## Nomad 1.3.2, 1.2.9, 1.1.15 + #### Client `max_kill_timeout` now enforced Nomad versions since v0.9 have incorrectly ignored the Client [`max_kill_timeout`][max_kill_timeout] -configuration option. This bug has been fixed in Nomad versions v1.4.0, v.1.3.2, +configuration option. This bug has been fixed in Nomad versions v.1.3.2, v1.2.9, and v1.1.15. Job submitters should be aware that a Task's [`kill_timeout`][kill_timeout] will be reduced to the Client's `max_kill_timeout` if the value exceeds the maximum.