Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate include_relocations setting #47443

Merged
merged 4 commits into from
Oct 8, 2019
Merged

Deprecate include_relocations setting #47443

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0853924
Deprecate include_relocations setting
DaveCTurner Oct 2, 2019
e8adb3e
No need to include relocations explicitly
DaveCTurner Oct 2, 2019
4698bac
Fix formatting of deprecation in docs
DaveCTurner Oct 2, 2019
c506899
Merge branch 'master' into 2019-10-02-deprecate-include-relocations
DaveCTurner Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/reference/modules/cluster/disk_allocator.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ PUT /twitter/_settings

`cluster.routing.allocation.disk.include_relocations`::

deprecated[7.5] Future versions will always account for relocations.
Defaults to +true+, which means that Elasticsearch will take into account
shards that are currently being relocated to the target node when computing
a node's disk usage. Taking relocating shards' sizes into account may,
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class DiskThresholdSettings {
Setting.Property.Dynamic, Setting.Property.NodeScope);
public static final Setting<Boolean> CLUSTER_ROUTING_ALLOCATION_INCLUDE_RELOCATIONS_SETTING =
Setting.boolSetting("cluster.routing.allocation.disk.include_relocations", true,
Setting.Property.Dynamic, Setting.Property.NodeScope);
Setting.Property.Dynamic, Setting.Property.NodeScope, Setting.Property.Deprecated);
public static final Setting<TimeValue> CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING =
Setting.positiveTimeSetting("cluster.routing.allocation.disk.reroute_interval", TimeValue.timeValueSeconds(60),
Setting.Property.Dynamic, Setting.Property.NodeScope);
Expand Down
3 changes: 3 additions & 0 deletions ...rc/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public void testUpdate() {
assertEquals(30L, diskThresholdSettings.getRerouteInterval().seconds());
assertFalse(diskThresholdSettings.isEnabled());
assertFalse(diskThresholdSettings.includeRelocations());

assertWarnings("[cluster.routing.allocation.disk.include_relocations] setting was deprecated in Elasticsearch and " +
"will be removed in a future release! See the breaking changes documentation for the next major version.");
}

public void testInvalidConstruction() {
Expand Down