Skip to content

Adding full object checksum for bidi flow #3546

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

Draft
Dhriti07 wants to merge 1 commit into
base: main
Choose a base branch
from
+409 −2
Draft

Adding full object checksum for bidi flow #3546

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
4 changes: 2 additions & 2 deletions ...cloud-storage/src/main/java/com/google/cloud/storage/BaseObjectReadSessionStreamRead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private AccumulatingRead(
IOAutoCloseable onCloseCallback) {
super(rangeSpec, retryContext, onCloseCallback);
this.readId = readId;
this.hasher = hasher;
this.hasher = (rangeSpec.begin() == 0) ? new CumulativeHasher(hasher, 0, rangeSpec.maxLength()) : hasher;
this.complete = SettableApiFuture.create();
this.childRefs = Collections.synchronizedList(new ArrayList<>());
}
Expand Down Expand Up @@ -280,7 +280,7 @@ static class StreamingRead extends BaseObjectReadSessionStreamRead<ScatteringByt
IOAutoCloseable onCloseCallback) {
super(rangeSpec, retryContext, onCloseCallback);
this.readId = new AtomicLong(readId);
this.hasher = hasher;
this.hasher = (rangeSpec.begin() == 0) ? new CumulativeHasher(hasher, 0, rangeSpec.maxLength()) : hasher;
this.closed = false;
this.failFuture = SettableApiFuture.create();
this.queue = new ArrayBlockingQueue<>(2);
Expand Down
15 changes: 15 additions & 0 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/ObjectReadSessionStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,12 @@ public void onResponse(BidiReadObjectResponse response) {
executor.execute(
StorageException.liftToRunnable(
() -> {
try {
validateCumulativeChecksum(read);
} catch (UncheckedCumulativeChecksumMismatchException e) {
state.removeOutstandingReadOnFailure(id, read::fail).onFailure(e);
return;
}
read.eof();
// don't remove the outstanding read until the future has been resolved
state.removeOutstandingRead(id);
Expand Down Expand Up @@ -545,6 +551,15 @@ public void onComplete() {
}
}

private void validateCumulativeChecksum(ObjectReadSessionStreamRead<?> read) {
Hasher hasher = read.hasher();
if (hasher instanceof CumulativeHasher) {
CumulativeHasher cumulativeHasher = (CumulativeHasher) hasher;
com.google.storage.v2.Object metadata = state.getMetadata();
cumulativeHasher.validateCumulativeChecksum(metadata);
}
}

static ObjectReadSessionStream create(
ScheduledExecutorService executor,
ZeroCopyBidiStreamingCallable<BidiReadObjectRequest, BidiReadObjectResponse> callable,
Expand Down
Loading
Loading