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

Jump to bottom

Revert change to S3 is_object, is_bucket checks #4370

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Revert change to S3 is_object, is_bucket checks #4370

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 test/src/unit-ssl-config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ void check_failure(Filesystem fs, Config& cfg) {
URI bucket_uri = URI(scheme + "://" + bucket_name);

Status st;
bool is_bucket;
std::vector<URI> uris;

try {
st = vfs.is_bucket(bucket_uri, &is_bucket);
st = vfs.ls(bucket_uri, &uris);
} catch (...) {
// Some backends throw exceptions to signal SSL error conditions
// so we pass the test by returning early here.
Expand Down
36 changes: 4 additions & 32 deletions tiledb/sm/filesystem/s3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,23 +784,9 @@ Status S3::is_bucket(const URI& uri, bool* const exists) const {
Aws::S3::Model::HeadBucketRequest head_bucket_request;
head_bucket_request.SetBucket(aws_uri.GetAuthority());
auto head_bucket_outcome = client_->HeadBucket(head_bucket_request);
*exists = head_bucket_outcome.IsSuccess();

if (head_bucket_outcome.IsSuccess()) {
*exists = true;
return Status::Ok();
}

auto err = head_bucket_outcome.GetError();

if (err.GetErrorType() == Aws::S3::S3Errors::NO_SUCH_BUCKET ||
err.GetErrorType() == Aws::S3::S3Errors::RESOURCE_NOT_FOUND) {
*exists = false;
return Status::Ok();
}

return LOG_STATUS(Status_S3Error(
"Failed to check if S3 bucket '" + uri.to_string() +
"' exists: " + outcome_error_message(head_bucket_outcome)));
return Status::Ok();
}

Status S3::is_object(const URI& uri, bool* const exists) const {
Expand Down Expand Up @@ -828,23 +814,9 @@ Status S3::is_object(
if (request_payer_ != Aws::S3::Model::RequestPayer::NOT_SET)
head_object_request.SetRequestPayer(request_payer_);
auto head_object_outcome = client_->HeadObject(head_object_request);
*exists = head_object_outcome.IsSuccess();

if (head_object_outcome.IsSuccess()) {
*exists = true;
return Status::Ok();
}

auto err = head_object_outcome.GetError();

if (err.GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY ||
err.GetErrorType() == Aws::S3::S3Errors::RESOURCE_NOT_FOUND) {
*exists = false;
return Status::Ok();
}

return LOG_STATUS(Status_S3Error(
"Failed to check if S3 object 's3://" + bucket_name + "/" + object_key +
"' exists: " + outcome_error_message(head_object_outcome)));
return Status::Ok();
}

Status S3::is_dir(const URI& uri, bool* exists) const {
Expand Down
Loading