FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: update grpc based ReadObject rpcs to remove race condition between cancellation and message handling by BenWhitehead · Pull Request #2708 · googleapis/java-storage · GitHub

/ java-storage Public

fix: update grpc based ReadObject rpcs to remove race condition between cancellation and message handling #2708

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
BenWhitehead merged 4 commits into from
Sep 20, 2024
Conversation 2 Commits 4 Checks 0 Files changed
Merged

fix: update grpc based ReadObject rpcs to remove race condition between cancellation and message handling #2708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f3fd43
fix: update grpc based ReadObject rpcs to remove race condition betwe…
BenWhitehead Sep 13, 2024
5186a80
fix improper exception wrapping and update test config for retry code
BenWhitehead Sep 16, 2024
b1d4996
fix setting metadata result for either success or failure
BenWhitehead Sep 16, 2024
98fea43
fix comment
BenWhitehead Sep 16, 2024
File filter

Filter by extension

Filter by extension .java  (9) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
33 changes: 26 additions & 7 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/GapicDownloadSessionBuilder.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@

import com.google.api.core.ApiFutures;
import com.google.api.core.SettableApiFuture;
import com.google.api.gax.retrying.ResultRetryAlgorithm;
import com.google.api.gax.rpc.ServerStreamingCallable;
import com.google.cloud.storage.BufferedReadableByteChannelSession.BufferedReadableByteChannel;
import com.google.cloud.storage.Retrying.RetryingDependencies;
import com.google.cloud.storage.UnbufferedReadableByteChannelSession.UnbufferedReadableByteChannel;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.storage.v2.Object;
Expand All @@ -43,27 +45,32 @@ public static GapicDownloadSessionBuilder create() {
return INSTANCE;
}

/**
* Any retry capability must be defined within the provided ServerStreamingCallable. The
* ultimately produced channel will not do any retries of its own.
*/
public ReadableByteChannelSessionBuilder byteChannel(
ServerStreamingCallable<ReadObjectRequest, ReadObjectResponse> read,
RetryingDependencies retryingDependencies,
ResultRetryAlgorithm<?> resultRetryAlgorithm,
ResponseContentLifecycleManager responseContentLifecycleManager) {
return new ReadableByteChannelSessionBuilder(read, responseContentLifecycleManager);
return new ReadableByteChannelSessionBuilder(
read, retryingDependencies, resultRetryAlgorithm, responseContentLifecycleManager);
}

public static final class ReadableByteChannelSessionBuilder {

private final ServerStreamingCallable<ReadObjectRequest, ReadObjectResponse> read;
private final RetryingDependencies retryingDependencies;
private final ResultRetryAlgorithm<?> resultRetryAlgorithm;
private final ResponseContentLifecycleManager responseContentLifecycleManager;
private boolean autoGzipDecompression;
private Hasher hasher;

private ReadableByteChannelSessionBuilder(
ServerStreamingCallable<ReadObjectRequest, ReadObjectResponse> read,
RetryingDependencies retryingDependencies,
ResultRetryAlgorithm<?> resultRetryAlgorithm,
ResponseContentLifecycleManager responseContentLifecycleManager) {
this.read = read;
this.retryingDependencies = retryingDependencies;
this.resultRetryAlgorithm = resultRetryAlgorithm;
this.responseContentLifecycleManager = responseContentLifecycleManager;
this.hasher = Hasher.noop();
this.autoGzipDecompression = false;
Expand Down Expand Up @@ -105,12 +112,24 @@ public UnbufferedReadableByteChannelSessionBuilder unbuffered() {
if (autoGzipDecompression) {
return new GzipReadableByteChannel(
new GapicUnbufferedReadableByteChannel(
resultFuture, read, object, hasher, responseContentLifecycleManager),
resultFuture,
read,
object,
hasher,
retryingDependencies,
resultRetryAlgorithm,
responseContentLifecycleManager),
ApiFutures.transform(
resultFuture, Object::getContentEncoding, MoreExecutors.directExecutor()));
} else {
return new GapicUnbufferedReadableByteChannel(
resultFuture, read, object, hasher, responseContentLifecycleManager);
resultFuture,
read,
object,
hasher,
retryingDependencies,
resultRetryAlgorithm,
responseContentLifecycleManager);
}
};
}
Expand Down
Loading
Back | FazBrowse Home | New Git URL