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

Autoscaling proactive trigger on low watermark #78941

Merged
merged 3 commits into from
Oct 15, 2021
Merged

Autoscaling proactive trigger on low watermark #78941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d26d002
Autoscaling proactive trigger on low watermark
henningandersen Oct 11, 2021
c637b19
Merge remote-tracking branch 'origin/master' into test_proactive_it_l…
henningandersen Oct 14, 2021
3351c01
Review fixes
henningandersen Oct 14, 2021
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
7 changes: 4 additions & 3 deletions ...est/java/org/elasticsearch/xpack/autoscaling/storage/AutoscalingStorageIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
import java.util.Collection;

public class AutoscalingStorageIntegTestCase extends DiskUsageIntegTestCase {
protected static final long WATERMARK_BYTES = 10240;
protected static final long HIGH_WATERMARK_BYTES = 10240;
protected static final long LOW_WATERMARK_BYTES = 2 * HIGH_WATERMARK_BYTES;

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
Expand All @@ -36,8 +37,8 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
@Override
protected Settings nodeSettings(final int nodeOrdinal, final Settings otherSettings) {
final Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings));
builder.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), (WATERMARK_BYTES * 2) + "b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), WATERMARK_BYTES + "b")
builder.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), LOW_WATERMARK_BYTES + "b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), HIGH_WATERMARK_BYTES + "b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING.getKey(), "0b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms")
.put(DiskThresholdDecider.ENABLE_FOR_SINGLE_DATA_NODE.getKey(), "true");
Expand Down
11 changes: 9 additions & 2 deletions ...ernalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public void testScaleUp() throws IOException, InterruptedException {

final String dsName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
createDataStreamAndTemplate(dsName);
for (int i = 0; i < between(1, 5); ++i) {
final int rolloverCount = between(1, 5);
for (int i = 0; i < rolloverCount; ++i) {
indexRandom(
true,
false,
Expand All @@ -78,7 +79,13 @@ public void testScaleUp() throws IOException, InterruptedException {
IndicesStatsResponse stats = client().admin().indices().prepareStats(dsName).clear().setStore(true).get();
long used = stats.getTotal().getStore().getSizeInBytes();
long maxShardSize = Arrays.stream(stats.getShards()).mapToLong(s -> s.getStats().getStore().sizeInBytes()).max().orElseThrow();
long enoughSpace = used + WATERMARK_BYTES + 1;
// As long as usage is above low watermark, we will trigger a proactive scale up, since the simulated shards have an in-sync
// set and therefore allocating these do not skip the low watermark check in the disk threshold decider.
// Fixing this simulation should be done as a separate effort, but we should still ensure that the low watermark is in effect
// at least when replicas are involved.
long enoughSpace = used + (randomBoolean()
? LOW_WATERMARK_BYTES - 1
: randomLongBetween(HIGH_WATERMARK_BYTES, LOW_WATERMARK_BYTES - 1));

setTotalSpace(dataNodeName, enoughSpace);

Expand Down
2 changes: 1 addition & 1 deletion ...ternalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void testScaleUp() throws InterruptedException {
long used = stats.getTotal().getStore().getSizeInBytes();
long minShardSize = Arrays.stream(stats.getShards()).mapToLong(s -> s.getStats().getStore().sizeInBytes()).min().orElseThrow();
long maxShardSize = Arrays.stream(stats.getShards()).mapToLong(s -> s.getStats().getStore().sizeInBytes()).max().orElseThrow();
long enoughSpace = used + WATERMARK_BYTES + 1;
long enoughSpace = used + HIGH_WATERMARK_BYTES + 1;

setTotalSpace(dataNodeName, enoughSpace);
GetAutoscalingCapacityAction.Response response = capacity();
Expand Down
6 changes: 6 additions & 0 deletions .../main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,12 @@ private SingleForecast forecast(IndexAbstraction.DataStream stream, long forecas
for (int i = 0; i < numberNewIndices; ++i) {
final String uuid = UUIDs.randomBase64UUID();
dataStream = dataStream.rollover(state.metadata(), uuid);

// this unintentionally copies the in-sync allocation ids too. This has the fortunate effect of these indices
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A prototype for a fix has been made, but since the original version already triggers at low watermark, adding it will mostly be a refinement. I will follow up on that subsequently.

// not being regarded new by the disk threshold decider, thereby respecting the low watermark threshold even for primaries.
// This is highly desirable so fixing this to clear the in-sync allocation ids will require a more elaborate solution,
// ensuring at least that when replicas are involved, we still respect the low watermark. This is therefore left as is
// for now with the intention to fix in a follow-up.
IndexMetadata newIndex = IndexMetadata.builder(writeIndex)
.index(dataStream.getWriteIndex().getName())
.settings(Settings.builder().put(writeIndex.getSettings()).put(IndexMetadata.SETTING_INDEX_UUID, uuid))
Expand Down