From 78f401cbfe23652c5ad3d4ba96e192fdab9102c4 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 24 Apr 2018 12:33:29 +0200 Subject: [PATCH 1/2] Remove usage of transient settings to enable allocations in rolling upgrade docs Since we disable allocation using persistent settings, we should be consistent and remove the setting from the persistent storage. Otherwise an accidental restart will leed for shards not being allocated. Relates to #28757 --- docs/reference/upgrade/rolling_upgrade.asciidoc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/reference/upgrade/rolling_upgrade.asciidoc b/docs/reference/upgrade/rolling_upgrade.asciidoc index 2b46b65f2617f..e223815d17e67 100644 --- a/docs/reference/upgrade/rolling_upgrade.asciidoc +++ b/docs/reference/upgrade/rolling_upgrade.asciidoc @@ -69,21 +69,15 @@ GET _cat/nodes + -- -NOTE: Because <<_precedence_of_settings, transient -settings take precedence over persistent settings>>, this overrides the -persistent setting used to disable shard allocation in the first step. If you -don't explicitly reenable shard allocation after a full cluster restart, the -persistent setting is used and shard allocation remains disabled. - -Once the node has joined the cluster, reenable shard allocation to start using -the node: +Once the node has joined the cluster, remove the `cluster.routing.allocation.enable` +settings to enable shard allocation and start using the node: [source,js] -------------------------------------------------- PUT _cluster/settings { - "transient": { - "cluster.routing.allocation.enable": "all" + "persistent": { + "cluster.routing.allocation.enable": null } } -------------------------------------------------- From 17ef17f04ba83a758434e76bcfcd89a83b94ec75 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 1 May 2018 15:50:53 +0200 Subject: [PATCH 2/2] typo --- docs/reference/upgrade/rolling_upgrade.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/upgrade/rolling_upgrade.asciidoc b/docs/reference/upgrade/rolling_upgrade.asciidoc index e223815d17e67..f82364c19a950 100644 --- a/docs/reference/upgrade/rolling_upgrade.asciidoc +++ b/docs/reference/upgrade/rolling_upgrade.asciidoc @@ -70,7 +70,7 @@ GET _cat/nodes -- Once the node has joined the cluster, remove the `cluster.routing.allocation.enable` -settings to enable shard allocation and start using the node: +setting to enable shard allocation and start using the node: [source,js] --------------------------------------------------