From 955542a50a4405c54fc77f733696088638334661 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 11 Jun 2018 21:32:39 -0400 Subject: [PATCH 1/4] Fix snippets in upgrade docs The upgrade docs were using the json language tag but console wants these to be js for proper formatting. This commit addresses that. --- docs/reference/upgrade.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/upgrade.asciidoc b/docs/reference/upgrade.asciidoc index 16ad61fe9a0..e1cab8832c9 100644 --- a/docs/reference/upgrade.asciidoc +++ b/docs/reference/upgrade.asciidoc @@ -83,7 +83,7 @@ collection after the upgrade to use monitoring. Set `xpack.monitoring.collection.enabled` to `true` with the `_cluster/settings` API: -[source,json] +[source,js] ---------------------------------------------------------- PUT /_cluster/settings { @@ -97,7 +97,7 @@ PUT /_cluster/settings To take all of the {xpack} features for a spin, you can start a 30-day trial from Kibana, or with the Start Trial API: -[source,json] +[source,js] ---------------------------------------------------------- POST _xpack/license/start_trial ---------------------------------------------------------- From 0e6589f48996d7bc13ea579fd628947181d3ab73 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 11 Jun 2018 22:04:30 -0400 Subject: [PATCH 2/4] Revert "Fix snippets in upgrade docs" This reverts commit 955542a50a4405c54fc77f733696088638334661. --- docs/reference/upgrade.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/upgrade.asciidoc b/docs/reference/upgrade.asciidoc index e1cab8832c9..16ad61fe9a0 100644 --- a/docs/reference/upgrade.asciidoc +++ b/docs/reference/upgrade.asciidoc @@ -83,7 +83,7 @@ collection after the upgrade to use monitoring. Set `xpack.monitoring.collection.enabled` to `true` with the `_cluster/settings` API: -[source,js] +[source,json] ---------------------------------------------------------- PUT /_cluster/settings { @@ -97,7 +97,7 @@ PUT /_cluster/settings To take all of the {xpack} features for a spin, you can start a 30-day trial from Kibana, or with the Start Trial API: -[source,js] +[source,json] ---------------------------------------------------------- POST _xpack/license/start_trial ---------------------------------------------------------- From 32cbbc2ecfbb28ebd02c5a09f9b21b372d906464 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 11 Jun 2018 22:04:36 -0400 Subject: [PATCH 3/4] Revert "[DOCS] Added 6.3 info & updated the upgrade table. (#30940)" This reverts commit 40d31d2ae0e5d1004a72de44738948434c8e7a06. --- docs/reference/upgrade.asciidoc | 62 ++++++--------------------------- 1 file changed, 11 insertions(+), 51 deletions(-) diff --git a/docs/reference/upgrade.asciidoc b/docs/reference/upgrade.asciidoc index 16ad61fe9a0..2ca2a012496 100644 --- a/docs/reference/upgrade.asciidoc +++ b/docs/reference/upgrade.asciidoc @@ -40,24 +40,25 @@ required. [cols="1> -|5.6 |{version} |<> footnoteref:[reindexfn, You must delete or reindex any indices created in 2.x before upgrading.] -|5.0-5.5 |{version} |<> footnoteref:[reindexfn] -|Pre-5.0 |{version} |<> +|5.x |5.y |<> (where `y > x`) +|5.6 |6.x |<> footnoteref:[reindexfn, You must delete or reindex any indices created in 2.x before upgrading.] +|5.0-5.5 |6.x |<> footnoteref:[reindexfn] +|<5.x |6.x |<> +|6.x |6.y |<> (where `y > x`) |======================================================================= [IMPORTANT] =============================================== Elasticsearch can read indices created in the *previous major version*. -Older indices must be reindexed or deleted. Elasticsearch 6.n -can use indices created in Elasticsearch 5.n, but not those created in -Elasticsearch 2.n or before. Elasticsearch 5.n can use indices created in -Elasticsearch 2.n, but not those created in 1.n or before. +Older indices must be reindexed or deleted. Elasticsearch 6.x +can use indices created in Elasticsearch 5.x, but not those created in +Elasticsearch 2.x or before. Elasticsearch 5.x can use indices created in +Elasticsearch 2.x, but not those created in 1.x or before. This also applies to indices backed up with <>. If an index was originally created in 2.n, it cannot be -restored to a 6.n cluster even if the snapshot was created by a 5.n cluster. +and restore>>. If an index was originally created in 2.x, it cannot be +restored to a 6.x cluster even if the snapshot was created by a 5.x cluster. Elasticsearch nodes will fail to start if incompatible indices are present. @@ -65,47 +66,6 @@ For information about how to upgrade old indices, see <>. =============================================== - -[float] -[[elasticsearch-upgrade-6.3]] -=== Upgrading to 6.3 -Starting in 6.3, the default distribution includes {xpack} with a free -Basic license. If you already have a Basic license, once you upgrade to 6.3 -it will never expire or need to be renewed. If you have a license subscription, -your license and settings are preserved when you upgrade. - -You can perform rolling upgrades to 6.3 from OSS-only clusters running 5.6 -or 6.0-6.2. {xpack} Basic features will be operational once the cluster is fully -upgraded. - -If you are using {xpack} for the first time, you must explicitly enable data -collection after the upgrade to use monitoring. Set -`xpack.monitoring.collection.enabled` to `true` with the `_cluster/settings` -API: - -[source,json] ----------------------------------------------------------- -PUT /_cluster/settings -{ - "persistent" : { - "xpack.monitoring.collection.enabled" : "true" - } -} ----------------------------------------------------------- -// CONSOLE - -To take all of the {xpack} features for a spin, you can start a 30-day trial -from Kibana, or with the Start Trial API: - -[source,json] ----------------------------------------------------------- -POST _xpack/license/start_trial ----------------------------------------------------------- -// CONSOLE - -The 30-day trial enables you to try out the full set of Platinum features, -including security, machine learning, alerting, graph capabilities, and more. - -- include::upgrade/rolling_upgrade.asciidoc[] From 1dbe554e5e9b6b0cefa8cf6a0a9cbc547fdf511c Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 11 Jun 2018 22:19:19 -0400 Subject: [PATCH 4/4] Suppress extras FS on caching directory tests This filesystem needs to be suppressed during these tests because it adds random files to the directory upon directory creation. That means that the size of these directories is off from what we expect them to be. Rather than loosening the assertion which could hide bugs on real directories, this commit suppresses this file system in this test suite. --- .../index/store/ByteSizeCachingDirectoryTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java index 25d783d2531..49de00dd8be 100644 --- a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java @@ -23,11 +23,13 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.io.IOException; +@LuceneTestCase.SuppressFileSystems("ExtrasFS") public class ByteSizeCachingDirectoryTests extends ESTestCase { private static class LengthCountingDirectory extends FilterDirectory {