-
Notifications
You must be signed in to change notification settings - Fork 25.5k
Limit size of shardDeleteResults #133558
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.
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
base: main
Are you sure you want to change the base?
Limit size of shardDeleteResults #133558
Changes from 26 commits
9870591
97e9969
24b7a62
d888113
ee89eb2
92991b9
3190772
a16856c
381d294
203d513
daf09b6
dc70d5b
0355c2a
f072128
abb2d4c
a0d728f
654ebf2
5ef0111
bd9217b
ba81bcf
acd2182
be05a1f
8d66c1e
ce64bf5
0fa5099
3575240
d55893d
3725a3c
ed00f1a
ce6195d
37404a5
fc41d60
d1e81f7
2f0ea30
6babba9
1ff464d
0d01264
d73ffef
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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; | ||
} | ||
|
||
private 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); | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,6 +71,7 @@ | |
import org.elasticsearch.common.io.stream.ReleasableBytesStreamOutput; | ||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
import org.elasticsearch.common.io.stream.TruncatedOutputStream; | ||
import org.elasticsearch.common.lucene.Lucene; | ||
import org.elasticsearch.common.lucene.store.InputStreamIndexInput; | ||
import org.elasticsearch.common.settings.Setting; | ||
|
@@ -146,6 +147,7 @@ | |
import java.io.BufferedInputStream; | ||
import java.io.BufferedOutputStream; | ||
import java.io.Closeable; | ||
import java.io.EOFException; | ||
import java.io.FilterInputStream; | ||
import java.io.IOException; | ||
import java.io.InputStream; | ||
|
@@ -1006,7 +1008,8 @@ private void createSnapshotsDeletion( | |
SnapshotsServiceUtils.minCompatibleVersion(minimumNodeVersion, originalRepositoryData, snapshotIds), | ||
originalRootBlobs, | ||
blobStore().blobContainer(indicesPath()).children(OperationPurpose.SNAPSHOT_DATA), | ||
originalRepositoryData | ||
originalRepositoryData, | ||
metadata.settings() | ||
); | ||
})); | ||
} | ||
|
@@ -1096,15 +1099,16 @@ class SnapshotsDeletion { | |
/** | ||
* Tracks the shard-level blobs which can be deleted once all the metadata updates have completed. | ||
*/ | ||
private final ShardBlobsToDelete shardBlobsToDelete = new ShardBlobsToDelete(); | ||
private final ShardBlobsToDelete shardBlobsToDelete; | ||
|
||
SnapshotsDeletion( | ||
Collection<SnapshotId> snapshotIds, | ||
long originalRepositoryDataGeneration, | ||
IndexVersion repositoryFormatIndexVersion, | ||
Map<String, BlobMetadata> originalRootBlobs, | ||
Map<String, BlobContainer> originalIndexContainers, | ||
RepositoryData originalRepositoryData | ||
RepositoryData originalRepositoryData, | ||
Settings settings | ||
) { | ||
this.snapshotIds = snapshotIds; | ||
this.originalRepositoryDataGeneration = originalRepositoryDataGeneration; | ||
|
@@ -1113,6 +1117,8 @@ class SnapshotsDeletion { | |
this.originalRootBlobs = originalRootBlobs; | ||
this.originalIndexContainers = originalIndexContainers; | ||
this.originalRepositoryData = originalRepositoryData; | ||
|
||
shardBlobsToDelete = new ShardBlobsToDelete(settings); | ||
} | ||
|
||
// --------------------------------------------------------------------------------------------------------------------------------- | ||
|
@@ -1666,6 +1672,7 @@ void writeTo(StreamOutput out) throws IOException { | |
} | ||
} | ||
|
||
private final int shardDeleteResultsMaxSize; | ||
/** | ||
* <p> | ||
* Shard-level results, i.e. a sequence of {@link ShardSnapshotMetaDeleteResult} objects, except serialized, concatenated, and | ||
|
@@ -1678,26 +1685,57 @@ void writeTo(StreamOutput out) throws IOException { | |
* need no further synchronization. | ||
* </p> | ||
*/ | ||
// If the size of this continues to be a problem even after compression, consider either a hard limit on its size (preferring leaked | ||
// blobs over an OOME on the master) or else offloading it to disk or to the repository itself. | ||
private final BytesStreamOutput shardDeleteResults = new ReleasableBytesStreamOutput(bigArrays); | ||
private final BytesStreamOutput shardDeleteResults; | ||
|
||
private int resultCount = 0; | ||
|
||
private final StreamOutput compressed = new OutputStreamStreamOutput( | ||
new BufferedOutputStream( | ||
new DeflaterOutputStream(Streams.flushOnCloseStream(shardDeleteResults)), | ||
DeflateCompressor.BUFFER_SIZE | ||
) | ||
); | ||
private final StreamOutput compressed; | ||
|
||
private final ArrayList<Closeable> resources = new ArrayList<>(); | ||
|
||
private final ShardGenerations.Builder shardGenerationsBuilder = ShardGenerations.builder(); | ||
|
||
ShardBlobsToDelete() { | ||
resources.add(compressed); | ||
resources.add(LeakTracker.wrap((Releasable) shardDeleteResults)); | ||
public final Setting<ByteSizeValue> MAX_SHARD_DELETE_RESULTS_SIZE_SETTING = Setting.memorySizeSetting( | ||
"repositories.blobstore.max_shard_delete_results_size", | ||
"25%", | ||
Setting.Property.NodeScope | ||
|
||
); | ||
|
||
ShardBlobsToDelete(Settings settings) { | ||
this.shardDeleteResultsMaxSize = calculateMaximumShardDeleteResultsSize(settings); | ||
if (this.shardDeleteResultsMaxSize > 0) { | ||
this.shardDeleteResults = new ReleasableBytesStreamOutput(bigArrays); | ||
this.compressed = new OutputStreamStreamOutput( | ||
new TruncatedOutputStream( | ||
new BufferedOutputStream( | ||
new DeflaterOutputStream(Streams.flushOnCloseStream(shardDeleteResults)), | ||
DeflateCompressor.BUFFER_SIZE | ||
), | ||
shardDeleteResults::size, | ||
this.shardDeleteResultsMaxSize | ||
) | ||
); | ||
resources.add(compressed); | ||
resources.add(LeakTracker.wrap((Releasable) shardDeleteResults)); | ||
} else { | ||
this.shardDeleteResults = null; | ||
this.compressed = null; | ||
} | ||
} | ||
|
||
/** | ||
* Calculates the maximum size of the shardDeleteResults BytesStreamOutput. | ||
* The size should at most be 2GB, but no more than 25% of the total remaining heap space. | ||
* A buffer of 1MB is maintained, so that even if the stream is of max size, there is room to flush | ||
* @return The maximum number of bytes the shardDeleteResults BytesStreamOutput can consume in the heap | ||
*/ | ||
int calculateMaximumShardDeleteResultsSize(Settings settings) { | ||
DaveCTurner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
long maxSizeInBytes = MAX_SHARD_DELETE_RESULTS_SIZE_SETTING.get(settings).getBytes(); | ||
int oneMBBuffer = 1024 * 1024; | ||
if (maxSizeInBytes > Integer.MAX_VALUE) { | ||
return Integer.MAX_VALUE - oneMBBuffer; | ||
DaveCTurner marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
} | ||
return (int) maxSizeInBytes; | ||
} | ||
|
||
synchronized void addShardDeleteResult( | ||
|
@@ -1706,6 +1744,11 @@ synchronized void addShardDeleteResult( | |
ShardGeneration newGeneration, | ||
Collection<String> blobsToDelete | ||
) { | ||
if (compressed == null) { | ||
// No output stream: skip writing, but still update generations | ||
DaveCTurner marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
shardGenerationsBuilder.put(indexId, shardId, newGeneration); | ||
return; | ||
} | ||
try { | ||
shardGenerationsBuilder.put(indexId, shardId, newGeneration); | ||
new ShardSnapshotMetaDeleteResult(Objects.requireNonNull(indexId.getId()), shardId, blobsToDelete).writeTo(compressed); | ||
DaveCTurner marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
@@ -1721,6 +1764,10 @@ public ShardGenerations getUpdatedShardGenerations() { | |
} | ||
|
||
public Iterator<String> getBlobPaths() { | ||
if (compressed == null || shardDeleteResults == null) { | ||
// No output stream: nothing to return | ||
|
||
return Collections.emptyIterator(); | ||
} | ||
final StreamInput input; | ||
try { | ||
compressed.close(); | ||
|
@@ -1736,20 +1783,32 @@ public Iterator<String> getBlobPaths() { | |
throw new UncheckedIOException(e); | ||
} | ||
|
||
return Iterators.flatMap(Iterators.forRange(0, resultCount, i -> { | ||
List<String> blobPaths = new ArrayList<>(); | ||
|
||
for (int i = 0; i < resultCount; i++) { | ||
ShardSnapshotMetaDeleteResult shardResult; | ||
try { | ||
return new ShardSnapshotMetaDeleteResult(input); | ||
shardResult = new ShardSnapshotMetaDeleteResult(input); | ||
} catch (EOFException ex) { | ||
DaveCTurner marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
// There was insufficient stream space to write this blob | ||
// All subsequent blobs will likewise be dangling | ||
logger.warn("Failure to clean up {} dangling blobs", resultCount - i); | ||
DaveCTurner marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
break; | ||
} catch (IOException e) { | ||
throw new UncheckedIOException(e); | ||
} | ||
}), shardResult -> { | ||
final var shardPath = shardPath(new IndexId("_na_", shardResult.indexId), shardResult.shardId).buildAsString(); | ||
return Iterators.map(shardResult.blobsToDelete.iterator(), blob -> shardPath + blob); | ||
}); | ||
String shardPath = shardPath(new IndexId("_na_", shardResult.indexId), shardResult.shardId).buildAsString(); | ||
for (String blob : shardResult.blobsToDelete) { | ||
blobPaths.add(shardPath + blob); | ||
} | ||
} | ||
return blobPaths.iterator(); | ||
} | ||
|
||
@Override | ||
public void close() { | ||
if (resources.isEmpty()) { | ||
return; | ||
} | ||
|
||
try { | ||
IOUtils.close(resources); | ||
} catch (IOException e) { | ||
|
@@ -1760,7 +1819,7 @@ public void close() { | |
|
||
// exposed for tests | ||
int sizeInBytes() { | ||
return shardDeleteResults.size(); | ||
return shardDeleteResults == null ? 0 : shardDeleteResults.size(); | ||
} | ||
} | ||
|
||
|
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()); | ||
} | ||
} |
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.
You have to register this setting in
ClusterSettings
.