Skip to content

Add content length to PUT GCP multipart complete #257

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
alamb merged 4 commits into from
Mar 24, 2025
Merged

Add content length to PUT GCP multipart complete #257

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0487b3b
Add content length to PUT GCP multipart complete
jkosh44 Mar 20, 2025
7f70f53
Use put method
jkosh44 Mar 21, 2025
a1b0e3d
Revert header change in put
jkosh44 Mar 21, 2025
cf9edd1
fixup
jkosh44 Mar 22, 2025
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
13 changes: 8 additions & 5 deletions src/gcp/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,13 @@ impl GoogleCloudStorageClient {
extensions,
} = opts;

let builder = self
.request(Method::PUT, path)
let builder = self.request(Method::PUT, path);
let builder = if payload.content_length() == 0 {
builder.header(&CONTENT_LENGTH, "0")
} else {
builder
};
let builder = builder
Copy link
Contributor

@tustvold tustvold Mar 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is unnecessary, with_payload already handles this

Copy link
Contributor Author

@jkosh44 jkosh44 Mar 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah got it, I just reverted this change.

.with_payload(payload)
.with_attributes(attributes)
.with_extensions(extensions);
Expand Down Expand Up @@ -516,9 +521,7 @@ impl GoogleCloudStorageClient {
if completed_parts.is_empty() {
// GCS doesn't allow empty multipart uploads
let result = self
.request(Method::PUT, path)
.idempotent(true)
.do_put()
.put(path, PutPayload::new(), Default::default())
.await?;
self.multipart_cleanup(path, multipart_id).await?;
Copy link
Contributor Author

@jkosh44 jkosh44 Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tustvold I was also trying to think about how to make this more obvious. Perhaps the following structure is more clear? The comment clarifies that we're falling back to a non-multipart upload. Also moving the PUT after the cleanup makes it clear that the cleanup is not affecting the PUT. What do you think?

            // GCS doesn't allow empty multipart uploads, so fallback to regular upload.
            self.multipart_cleanup(path, multipart_id).await?;
            let result = self
                .put(path, PutPayload::new(), Default::default())
                .await?;

Copy link
Contributor

@tustvold tustvold Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't feel strongly either way

Copy link
Contributor Author

@jkosh44 jkosh44 Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I made the change.

return Ok(result);
Expand Down