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

Fix single upload retry. #12834

Merged
merged 1 commit into from
Jul 6, 2020
Merged

Fix single upload retry. #12834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...storage-common/src/main/java/com/azure/storage/common/implementation/PayloadSizeGate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ Flux<ByteBuffer> write(ByteBuffer buf) {
*/
Flux<ByteBuffer> flush() {
if (byteBuffers != null) {
Flux<ByteBuffer> result = dequeuingFlux(byteBuffers);
// We return Flux from iterable in this case to support retries on single upload.
Flux<ByteBuffer> result = Flux.fromIterable(byteBuffers);
byteBuffers = null;
return result;
} else {
Expand Down
10 changes: 7 additions & 3 deletions ...ure-storage-common/src/main/java/com/azure/storage/common/implementation/UploadUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,18 @@ public static <T> Mono<Response<T>> uploadFullOrChunked(final Flux<ByteBuffer> d
.filter(ByteBuffer::hasRemaining)
// The gate buffers data until threshold is breached.
.concatMap(gate::write)
.concatWith(Flux.defer(gate::flush))
// First buffer is emitted after threshold is breached or there's no more data.
// Therefore we can make a decision how to upload data on first element.
.switchOnFirst((signal, flux) -> {
if (gate.isThresholdBreached()) {
return uploadInChunks.apply(flux);
// In this case we can pass a flux that can have just one subscriber because
// the chunked upload is going to cache the data downstream before sending chunks over the wire.
return uploadInChunks.apply(flux.concatWith(Flux.defer(gate::flush)));
} else {
return uploadFull.apply(flux, gate.size());
// In this case gate contains all the data cached.
// The flux passed to this lambda allows only one subscriber. Therefore we substitute it
// with flux coming from gate which is based of iterable and can be subscribed again.
return uploadFull.apply(gate.flush(), gate.size());
}
})
.next()
Expand Down