Skip to content

fix: update grpc upload logic to follow hashing behavior of json #2107

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 2 commits into from
Jul 11, 2023
Merged

fix: update grpc upload logic to follow hashing behavior of json #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874ca6f
fix: update grpc upload logic to follow hashing behavior of json
BenWhitehead Jul 7, 2023
6570868
chore: remove comment
BenWhitehead Jul 10, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
import com.google.storage.v2.NotificationConfigName;
import com.google.storage.v2.Object;
import com.google.storage.v2.ObjectAccessControl;
import com.google.storage.v2.ObjectChecksums;
import com.google.storage.v2.ReadObjectRequest;
import com.google.storage.v2.RewriteObjectRequest;
import com.google.storage.v2.RewriteResponse;
Expand Down Expand Up @@ -233,7 +232,7 @@ public Blob create(
GrpcCallContext grpcCallContext =
opts.grpcMetadataMapper().apply(GrpcCallContext.createDefault());
WriteObjectRequest req = getWriteObjectRequest(blobInfo, opts);
Hasher hasher = getHasherForRequest(req, Hasher.enabled());
Hasher hasher = Hasher.enabled();
GrpcCallContext merge = Utils.merge(grpcCallContext, Retrying.newCallContext());
return Retrying.run(
getOptions(),
Expand Down Expand Up @@ -286,8 +285,6 @@ public Blob createFrom(BlobInfo blobInfo, Path path, int bufferSize, BlobWriteOp
opts.grpcMetadataMapper().apply(GrpcCallContext.createDefault());
WriteObjectRequest req = getWriteObjectRequest(blobInfo, opts);

Hasher hasher = getHasherForRequest(req, Hasher.enabled());

long size = Files.size(path);
if (size < bufferSize) {
// ignore the bufferSize argument if the file is smaller than it
Expand All @@ -300,7 +297,7 @@ public Blob createFrom(BlobInfo blobInfo, Path path, int bufferSize, BlobWriteOp
ResumableMedia.gapic()
.write()
.byteChannel(storageClient.writeObjectCallable().withDefaultCallContext(merge))
.setHasher(hasher)
.setHasher(Hasher.enabled())
.setByteStringStrategy(ByteStringStrategy.noCopy())
.direct()
.buffered(Buffers.allocate(size))
Expand All @@ -323,7 +320,7 @@ public Blob createFrom(BlobInfo blobInfo, Path path, int bufferSize, BlobWriteOp
.write()
.byteChannel(
storageClient.writeObjectCallable().withDefaultCallContext(grpcCallContext))
.setHasher(hasher)
.setHasher(Hasher.noop())
.setByteStringStrategy(ByteStringStrategy.noCopy())
.resumable()
.withRetryConfig(getOptions(), retryAlgorithmManager.idempotent())
Expand Down Expand Up @@ -359,13 +356,12 @@ public Blob createFrom(

ApiFuture<ResumableWrite> start = startResumableWrite(grpcCallContext, req);

Hasher hasher = getHasherForRequest(req, Hasher.enabled());
BufferedWritableByteChannelSession<WriteObjectResponse> session =
ResumableMedia.gapic()
.write()
.byteChannel(
storageClient.writeObjectCallable().withDefaultCallContext(grpcCallContext))
.setHasher(hasher)
.setHasher(Hasher.noop())
.setByteStringStrategy(ByteStringStrategy.noCopy())
.resumable()
.withRetryConfig(getOptions(), retryAlgorithmManager.idempotent())
Expand Down Expand Up @@ -739,7 +735,7 @@ public GrpcBlobWriteChannel writer(BlobInfo blobInfo, BlobWriteOption... options
GrpcCallContext grpcCallContext =
opts.grpcMetadataMapper().apply(GrpcCallContext.createDefault());
WriteObjectRequest req = getWriteObjectRequest(blobInfo, opts);
Hasher hasher = getHasherForRequest(req, Hasher.enabled());
Hasher hasher = Hasher.noop();
return new GrpcBlobWriteChannel(
storageClient.writeObjectCallable(),
getOptions(),
Expand Down Expand Up @@ -1967,19 +1963,6 @@ private Object updateObject(UpdateObjectRequest req) {
Decoder.identity());
}

private static Hasher getHasherForRequest(WriteObjectRequest req, Hasher defaultHasher) {
if (!req.hasObjectChecksums()) {
return defaultHasher;
} else {
ObjectChecksums checksums = req.getObjectChecksums();
if (!checksums.hasCrc32C() && checksums.getMd5Hash().isEmpty()) {
return defaultHasher;
} else {
return Hasher.noop();
}
}
}

@Nullable
private Blob internalBlobGet(BlobId blob, Opts<ObjectSourceOpt> unwrap) {
Opts<ObjectSourceOpt> opts = unwrap.resolveFrom(blob).prepend(defaultOpts);
Expand Down
3 changes: 1 addition & 2 deletions ...loud-storage/src/test/java/com/google/cloud/storage/ITGrpcStorageImplUploadRetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,11 @@ private static final class Resumable {
StartResumableWriteResponse.newBuilder().setUploadId(uploadId).build();

private static final ChecksummedData checksummedData =
TestUtils.getChecksummedData(ByteString.copyFrom(bytes), Hasher.enabled());
TestUtils.getChecksummedData(ByteString.copyFrom(bytes), Hasher.noop());
private static final WriteObjectRequest req1 =
WriteObjectRequest.newBuilder()
.setUploadId(uploadId)
.setChecksummedData(checksummedData)
.setObjectChecksums(ObjectChecksums.newBuilder().setCrc32C(checksummedData.getCrc32C()))
.setFinishWrite(true)
.build();
private static final WriteObjectResponse resp1 =
Expand Down