Limit size of shardDeleteResults #133558
+427
−74
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.common.io.stream; | ||
|
|
||
| import java.io.FilterOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.OutputStream; | ||
| import java.util.function.IntSupplier; | ||
|
|
||
| /** | ||
| * Truncates writes once the max size is exceeded. | ||
| * However, when writing byte arrays, the stream does not check whether there is capacity for the full | ||
| * array prior to writing, so there is overspill of up to b.length - 1. | ||
| */ | ||
| public class TruncatedOutputStream extends FilterOutputStream { | ||
| private final IntSupplier currentSizeSupplier; | ||
| private final int maxSize; | ||
| private boolean hasCapacity = true; | ||
|
|
||
| public TruncatedOutputStream(OutputStream out, IntSupplier currentSizeSupplier, int maxSize) { | ||
| super(out); | ||
| this.currentSizeSupplier = currentSizeSupplier; | ||
| this.maxSize = maxSize; | ||
| } | ||
|
|
||
| public boolean hasCapacity() { | ||
| if (hasCapacity) { | ||
| hasCapacity = currentSizeSupplier.getAsInt() < maxSize; | ||
| } | ||
| return hasCapacity; | ||
| } | ||
|
|
||
| @Override | ||
| public void write(int b) throws IOException { | ||
| if (hasCapacity()) { | ||
| out.write(b); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void write(byte[] b) throws IOException { | ||
| if (hasCapacity()) { | ||
| out.write(b); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void write(byte[] b, int off, int len) throws IOException { | ||
| if (hasCapacity()) { | ||
| out.write(b, off, len); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.common.io.stream; | ||
|
|
||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class TruncatedOutputStreamTests extends ESTestCase { | ||
|
|
||
| public void testWriteSingleBytes() throws IOException { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| int maxSize = randomIntBetween(0, 100); | ||
| TruncatedOutputStream truncatedOutputStream = new TruncatedOutputStream( | ||
| byteArrayOutputStream, | ||
| byteArrayOutputStream::size, | ||
| maxSize | ||
| ); | ||
|
|
||
| byte[] values = new byte[maxSize]; | ||
|
|
||
| // Write enough bytes within the defined maxSize | ||
| for (int i = 0; i < maxSize; i++) { | ||
| byte b = randomByte(); | ||
| truncatedOutputStream.write(b); | ||
| values[i] = b; | ||
| } | ||
|
|
||
| // The stream should be truncated now that it is filled | ||
| for (int i = 0; i < randomIntBetween(0, 20); i++) { | ||
| truncatedOutputStream.write(randomByte()); | ||
| } | ||
|
|
||
| assertArrayEquals(values, byteArrayOutputStream.toByteArray()); | ||
| } | ||
|
|
||
| public void testWriteByteArray() throws IOException { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| int maxSize = randomIntBetween(100, 200); | ||
| TruncatedOutputStream truncatedOutputStream = new TruncatedOutputStream( | ||
| byteArrayOutputStream, | ||
| byteArrayOutputStream::size, | ||
| maxSize | ||
| ); | ||
|
|
||
| List<Byte> values = new ArrayList<>(); | ||
| int bytesWritten = 0; | ||
| // Write beyond the streams capacity | ||
| while (bytesWritten <= maxSize * 2) { | ||
| byte[] bytes = randomByteArrayOfLength(randomIntBetween(0, 20)); | ||
| truncatedOutputStream.write(bytes); | ||
|
|
||
| // If there was capacity before writing, then the stream wrote the entire array | ||
| // even if that meant overflowing | ||
| if (bytesWritten < maxSize) { | ||
| for (byte b : bytes) { | ||
| values.add(b); | ||
| } | ||
| } | ||
|
|
||
| bytesWritten += bytes.length; | ||
| } | ||
|
|
||
| byte[] valuesAsByteArray = new byte[values.size()]; | ||
| int i = 0; | ||
| for (byte b : values) { | ||
| valuesAsByteArray[i] = b; | ||
| i++; | ||
| } | ||
|
|
||
| assertArrayEquals(valuesAsByteArray, byteArrayOutputStream.toByteArray()); | ||
| } | ||
|
|
||
| public void testWriteByteArrayWithOffsetAndLength() throws IOException { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| int maxSize = randomIntBetween(100, 200); | ||
| TruncatedOutputStream truncatedOutputStream = new TruncatedOutputStream( | ||
| byteArrayOutputStream, | ||
| byteArrayOutputStream::size, | ||
| maxSize | ||
| ); | ||
|
|
||
| List<Byte> values = new ArrayList<>(); | ||
| int bytesWritten = 0; | ||
| // Write beyond the streams capacity | ||
| while (bytesWritten <= maxSize * 2) { | ||
| byte[] bytes = randomByteArrayOfLength(randomIntBetween(0, 20)); | ||
| int offset = randomIntBetween(0, bytes.length); | ||
| int length = randomIntBetween(0, bytes.length - offset); | ||
| truncatedOutputStream.write(bytes, offset, length); | ||
|
|
||
| // If there was capacity before writing, then the stream wrote the sub array | ||
| // even if that meant overflowing | ||
| if (bytesWritten < maxSize) { | ||
| for (int i = offset; i < offset + length; i++) { | ||
| values.add(bytes[i]); | ||
| } | ||
| } | ||
|
|
||
| bytesWritten += length; | ||
| } | ||
|
|
||
| byte[] valuesAsByteArray = new byte[values.size()]; | ||
| int i = 0; | ||
| for (byte b : values) { | ||
| valuesAsByteArray[i] = b; | ||
| i++; | ||
| } | ||
|
|
||
| assertArrayEquals(valuesAsByteArray, byteArrayOutputStream.toByteArray()); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yet more trappiness: you now need to register a listener for updates to this setting (e.g. call
clusterSettings.initializeAndWatch(...)). You can get aclusterSettingsfromclusterService.getClusterSettings(). I think I'd be inclined to do that in theBlobStoreRepositoryconstructor rather than doing it each time we create aSnapshotsDeletion.