Fix: Replication of large documents breaches the size limit (2GB) of ReleasableBytesStreamOutput #1580
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,84 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| package org.opensearch.replication.task.shard | ||
|
|
||
| import org.opensearch.index.IndexSettings | ||
| import org.opensearch.replication.ReplicationPlugin | ||
| import org.opensearch.replication.ReplicationSettings | ||
|
|
||
| /** | ||
| * Helper class to manage batch size settings with fallback from index-level to cluster-level | ||
| */ | ||
| class BatchSizeSettings( | ||
| private val indexSettings: IndexSettings, | ||
| private val replicationSettings: ReplicationSettings | ||
| ) { | ||
|
|
||
| /** | ||
| * Get the effective batch size - index-level if set, otherwise cluster-level | ||
| */ | ||
| fun getBatchSize(): Int { | ||
| return if (hasIndexLevelSetting()) { | ||
| ReplicationPlugin.REPLICATION_FOLLOWER_OPS_BATCH_SIZE_INDEX.get(indexSettings.settings) | ||
| } else { | ||
| replicationSettings.batchSize | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Check if index-level setting is configured | ||
| */ | ||
| fun hasIndexLevelSetting(): Boolean { | ||
| return indexSettings.settings.hasValue(ReplicationPlugin.REPLICATION_FOLLOWER_OPS_BATCH_SIZE_INDEX.key) | ||
ankitkala marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| /** | ||
| * Get the source of the current batch size setting | ||
| */ | ||
| fun getBatchSizeSource(): String { | ||
| return if (hasIndexLevelSetting()) "index-level" else "cluster-level" | ||
| } | ||
|
|
||
| // For dynamic batch size adjustment (2GB fix) | ||
| @Volatile | ||
| private var dynamicBatchSize: Int? = null | ||
| private val minBatchSize = 16 | ||
|
||
|
|
||
| /** | ||
| * Get effective batch size considering dynamic adjustments | ||
| */ | ||
| fun getEffectiveBatchSize(): Int { | ||
| return dynamicBatchSize ?: getBatchSize() | ||
| } | ||
|
|
||
| /** | ||
| * Reduce batch size for 2GB limit handling | ||
| */ | ||
| fun reduceBatchSize() { | ||
| val currentSize = getEffectiveBatchSize() | ||
ankitkala marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| dynamicBatchSize = maxOf(currentSize / 2, minBatchSize) | ||
| } | ||
|
|
||
| /** | ||
| * Reset to original batch size after successful operations | ||
| */ | ||
| fun resetBatchSize() { | ||
| dynamicBatchSize = null | ||
| } | ||
|
|
||
| /** | ||
| * Check if batch size has been dynamically reduced | ||
| */ | ||
| fun isDynamicallyReduced(): Boolean { | ||
| return dynamicBatchSize != null | ||
| } | ||
| } | ||
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
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.
Nit: Cluster level