Skip to content

Storage - [Content Validation] Make synchronous stageBlock request body replayable on retry #49612

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

Merged
ibrandes merged 3 commits into from
Jun 24, 2026
+11 −5
Merged

Storage - [Content Validation] Make synchronous stageBlock request body replayable on retry #49612

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
4b6ba84
Make synchronous stageBlock request body replayable on retry
ibrandes Jun 23, 2026
a2de01d
updating assets (unrelated to the changes in this PR)
ibrandes Jun 23, 2026
dfe50eb
updating recordings
ibrandes Jun 23, 2026
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
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/storage/azure-storage-blob",
"Tag": "java/storage/azure-storage-blob_afc0d343f3"
"Tag": "java/storage/azure-storage-blob_494b72fca7"
}
14 changes: 10 additions & 4 deletions .../azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,17 @@
import com.azure.storage.blob.options.BlockBlobSimpleUploadOptions;
import com.azure.storage.blob.options.BlockBlobStageBlockFromUrlOptions;
import com.azure.storage.blob.options.BlockBlobStageBlockOptions;
import com.azure.storage.common.Utility;
import com.azure.storage.common.implementation.Constants;
import com.azure.storage.common.implementation.StorageImplUtils;
import com.azure.storage.common.implementation.StorageSeekableByteChannel;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.channels.SeekableByteChannel;
import java.time.Duration;
import java.util.List;
Expand Down Expand Up @@ -783,10 +786,13 @@ public Response<Void> stageBlockWithResponse(String base64BlockId, InputStream d
String leaseId, Duration timeout, Context context) {
StorageImplUtils.assertNotNull("data", data);

Mono<Response<Void>> response = client.stageBlockWithResponseInternal(
new BlockBlobStageBlockOptions(base64BlockId, BinaryData.fromStream(data, length)).setContentMd5(contentMd5)
.setLeaseId(leaseId),
context);
Flux<ByteBuffer> fbb
= Utility.convertStreamToByteBuffer(data, length, BlobAsyncClient.BLOB_DEFAULT_UPLOAD_BLOCK_SIZE, true);

Mono<Response<Void>> response = BinaryData.fromFlux(fbb, length, false)
.flatMap(binaryData -> client.stageBlockWithResponseInternal(
new BlockBlobStageBlockOptions(base64BlockId, binaryData).setContentMd5(contentMd5).setLeaseId(leaseId),
context));
return blockWithOptionalTimeout(response, timeout);
}

Expand Down
Loading