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

Made multipart write test smarter #42

Merged
merged 7 commits into from
Aug 27, 2024
Merged

Made multipart write test smarter #42

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5eed5d2
uploads to s3 using multipart uploads. Testing seems to be working, b…
rw2 Aug 20, 2024
4ea65fe
uploads to s3 using multipart uploads. Testing seems to be working, b…
rw2 Aug 21, 2024
4f95b0f
uploads to s3 using multipart uploads. Testing seems to be working, b…
rw2 Aug 21, 2024
eea44e3
uploads to s3 using multipart uploads. Testing seems to be working, b…
rw2 Aug 22, 2024
4b41774
uploads to s3 using multipart uploads. Testing seems to be working, b…
rw2 Aug 22, 2024
9e7820a
Merge remote-tracking branch 'origin/simple-fix' into simple-fix
rw2 Aug 22, 2024
1574650
Merge remote-tracking branch 'origin/simple-fix' into simple-fix
rw2 Aug 22, 2024
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
18 changes: 10 additions & 8 deletions src/S3File.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@ int S3File::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
}
}

AmazonS3CreateMultipartUpload startUpload(m_ai, m_object, m_log);
if (!startUpload.SendRequest()) {
m_log.Emsg("Open", "S3 multipart request failed");
return -ENOENT;
}
std::string errMsg;
startUpload.Results(uploadId, errMsg);

return 0;
}

Expand Down Expand Up @@ -194,6 +186,16 @@ int S3File::Fstat(struct stat *buff) {
}

ssize_t S3File::Write(const void *buffer, off_t offset, size_t size) {
if (uploadId == "") {
AmazonS3CreateMultipartUpload startUpload(m_ai, m_object, m_log);
if (!startUpload.SendRequest()) {
m_log.Emsg("Open", "S3 multipart request failed");
return -ENOENT;
}
std::string errMsg;
startUpload.Results(uploadId, errMsg);
}

std::string payload((char *)buffer, size);
size_t payload_size = payload.length();
if (payload_size != size) {
Expand Down
Loading