Merge branch 'master' into issue#51806

docs/reference/migration/migrate_8_0/settings.asciidoc

@@ -66,30 +66,103 @@ an increase in the number of physical CPUs on which to schedule these additional
 threads, the `node.processors` setting is now bounded by the number of available
 processors.
 
-[float]
-[[remove-gateway-expected_nodes]]
-==== The `gateway.expected_nodes` setting have been removed
+*Impact* +
+If specified, ensure the value of `node.processors` setting does not exceed the
+number of available processors. Setting the `node.processors` value greater than
+the number of available processors in `elasticsearch.yml` will result in an
+error on startup.
+====
 
-The `gateway.expected_nodes` setting was deprecated in version 7.7.0, and is
-removed in version 8.0.0. Instead, use `gateway.expected_data_nodes`.
+.The `cluster.remote.connect` setting has been removed.
+[%collapsible]
+====
+*Details* +
+In Elasticsearch 7.7.0, the setting `cluster.remote.connect` was deprecated in
+favor of setting `node.remote_cluster_client`. In Elasticsearch 8.0.0, the
+setting `cluster.remote.connect` is removed.
 
-[float]
-[[remove-gateway-expected_master_nodes]]
-==== The `gateway.expected_master_nodes` setting have been removed
+*Impact* +
+Use the `node.remote_cluster_client` setting. Discontinue use of the
+`cluster.remote.connect` setting. Specifying the `cluster.remote.connect`
+setting in `elasticsearch.yml` will result in an error on startup.
+====
 
-The `gateway.expected_master_nodes` setting was deprecated in version 7.7.0, and is
-removed in version 8.0.0. Instead, use `gateway.expected_data_nodes`.
+.The `node.local_storage` setting has been removed.
+[%collapsible]
+====
+*Details* +
+In Elasticsearch 7.8.0, the setting `node.local_storage` was deprecated and
+beginning in Elasticsearch 8.0.0 all nodes will require local storage. Therefore,
+the `node.local_storage` setting has been removed.
 
-[float]
-[[remove-gateway-recover_after_nodes]]
-==== The `gateway.recover_after_nodes` setting have been removed
+*Impact* +
+Discontinue use of the `node.local_storage` setting. Specifying this setting in
+`elasticsearch.yml` will result in an error on startup.
+====
 
-The `gateway.recover_after_nodes` setting was deprecated in version 7.7.0, and is
-removed in version 8.0.0. Instead, use `gateway.recover_after_data_nodes`.
+.The `auth.password` setting for HTTP monitoring has been removed.
+[%collapsible]
+====
+*Details* +
+In Elasticsearch 7.7.0, the setting `xpack.monitoring.exporters.<exporterName>.auth.password`
+was deprecated in favor of setting `xpack.monitoring.exporters.<exporterName>.auth.secure_password`.
+In Elasticsearch 8.0.0, the setting `xpack.monitoring.exporters.<exporterName>.auth.password` is
+removed.
 
-[float]
-[[remove-gateway-recover_after_master_nodes]]
-==== The `gateway.recover_after_master_nodes` setting have been removed
+*Impact* +
+Use the `xpack.monitoring.exporters.<exporterName>.auth.secure_password`
+setting. Discontinue use of the
+`xpack.monitoring.exporters.<exporterName>.auth.password` setting. Specifying
+the `xpack.monitoring.exporters.<exporterName>.auth.password` setting in
+`elasticsearch.yml` will result in an error on startup.
+====
+
+.Settings used to disable basic license features have been removed.
+[%collapsible]
+====
+*Details* +
+The following settings were deprecated in {es} 7.8.0 and have been removed
+in {es} 8.0.0:
+
+* `xpack.enrich.enabled`
+* `xpack.flattened.enabled`
+* `xpack.ilm.enabled`
+* `xpack.monitoring.enabled`
+* `xpack.rollup.enabled`
+* `xpack.slm.enabled`
+* `xpack.sql.enabled`
+* `xpack.transform.enabled`
+* `xpack.vectors.enabled`
+
+These basic license features are now always enabled for the {default-dist}.
+
+If you have disabled ILM so that you can use another tool to manage Watcher
+indices, the newly introduced `xpack.watcher.use_ilm_index_management` setting
+may be set to false.
+
+*Impact* +
+Discontinue use of the removed settings. Specifying these settings in
+`elasticsearch.yml` will result in an error on startup.
+====
+
+.Settings used to defer cluster recovery pending a certain number of master nodes have been removed.
+[%collapsible]
+====
+*Details* +
+The following settings were deprecated in {es} 7.8.0 and have been removed in
+{es} 8.0.0:
+
+* `gateway.expected_nodes`
+* `gateway.expected_master_nodes`
+* `gateway.recover_after_nodes`
+* `gateway.recover_after_master_nodes`
+
+It is safe to recover the cluster as soon as a majority of master-eligible
+nodes have joined so there is no benefit in waiting for any additional
+master-eligible nodes to start.
+
+*Impact* +
+Discontinue use of the removed settings. If needed, use
+`gateway.expected_data_nodes` or `gateway.recover_after_data_nodes` to defer
+cluster recovery pending a certain number of data nodes.
 
-The `gateway.recover_after_master_nodes` setting was deprecated in version 7.7.0, and
-is removed in version 8.0.0. Instead, use `gateway.recover_after_data_nodes`.

server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java

@@ -81,4 +81,25 @@ public void testDefaultRecoverAfterTime() {
         assertThat(service.recoverAfterTime().millis(), Matchers.equalTo(timeValue.millis()));
     }
 
+    public void testRecoverStateUpdateTask() throws Exception {
+        GatewayService service = createService(Settings.builder());
+        ClusterStateUpdateTask clusterStateUpdateTask = service.new RecoverStateUpdateTask();
+        String nodeId = randomAlphaOfLength(10);
+        DiscoveryNode masterNode = DiscoveryNode.createLocal(
+            settings(Version.CURRENT).put(masterNode()).build(),
+            new TransportAddress(TransportAddress.META_ADDRESS, 9300),
+            nodeId
+        );
+        ClusterState stateWithBlock = ClusterState.builder(ClusterName.DEFAULT)
+            .nodes(DiscoveryNodes.builder().localNodeId(nodeId).masterNodeId(nodeId).add(masterNode).build()).
+                blocks(ClusterBlocks.builder().addGlobalBlock(STATE_NOT_RECOVERED_BLOCK).build()).build();
+
+        ClusterState recoveredState = clusterStateUpdateTask.execute(stateWithBlock);
+        assertNotEquals(recoveredState, stateWithBlock);
+        assertThat(recoveredState.blocks().global(ClusterBlockLevel.METADATA_WRITE), not(hasItem(STATE_NOT_RECOVERED_BLOCK)));
+
+        ClusterState clusterState = clusterStateUpdateTask.execute(recoveredState);
+        assertSame(recoveredState, clusterState);
+    }
+
 }