Skip to content
Merged
Changes from 2 commits
Commits
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
84 changes: 81 additions & 3 deletions cpp/src/arrow/filesystem/s3_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,84 @@ inline bool IsAlreadyExists(const Aws::Client::AWSError<Aws::S3::S3Errors>& erro
error_type == Aws::S3::S3Errors::BUCKET_ALREADY_OWNED_BY_YOU);
}

std::string S3ErrorToString(int error_type) {
switch (static_cast<Aws::S3::S3Errors>(error_type)) {
case Aws::S3::S3Errors::INCOMPLETE_SIGNATURE:
return "INCOMPLETE_SIGNATURE";
Comment thread
pitrou marked this conversation as resolved.
Outdated
case Aws::S3::S3Errors::INTERNAL_FAILURE:
return "INTERNAL_FAILURE";
case Aws::S3::S3Errors::INVALID_ACTION:
return "INVALID_ACTION";
case Aws::S3::S3Errors::INVALID_CLIENT_TOKEN_ID:
return "INVALID_CLIENT_TOKEN_ID";
case Aws::S3::S3Errors::INVALID_PARAMETER_COMBINATION:
return "INVALID_PARAMETER_COMBINATION";
case Aws::S3::S3Errors::INVALID_QUERY_PARAMETER:
return "INVALID_QUERY_PARAMETER";
case Aws::S3::S3Errors::INVALID_PARAMETER_VALUE:
return "INVALID_PARAMETER_VALUE";
case Aws::S3::S3Errors::MISSING_ACTION:
return "MISSING_ACTION";
case Aws::S3::S3Errors::MISSING_AUTHENTICATION_TOKEN:
return "MISSING_AUTHENTICATION_TOKEN";
case Aws::S3::S3Errors::MISSING_PARAMETER:
return "MISSING_PARAMETER";
case Aws::S3::S3Errors::OPT_IN_REQUIRED:
return "OPT_IN_REQUIRED";
case Aws::S3::S3Errors::REQUEST_EXPIRED:
return "REQUEST_EXPIRED";
case Aws::S3::S3Errors::SERVICE_UNAVAILABLE:
return "SERVICE_UNAVAILABLE";
case Aws::S3::S3Errors::THROTTLING:
return "THROTTLING";
case Aws::S3::S3Errors::VALIDATION:
return "VALIDATION";
case Aws::S3::S3Errors::ACCESS_DENIED:
return "ACCESS_DENIED";
case Aws::S3::S3Errors::RESOURCE_NOT_FOUND:
return "RESOURCE_NOT_FOUND";
case Aws::S3::S3Errors::UNRECOGNIZED_CLIENT:
return "UNRECOGNIZED_CLIENT";
case Aws::S3::S3Errors::MALFORMED_QUERY_STRING:
return "MALFORMED_QUERY_STRING";
case Aws::S3::S3Errors::SLOW_DOWN:
return "SLOW_DOWN";
case Aws::S3::S3Errors::REQUEST_TIME_TOO_SKEWED:
return "REQUEST_TIME_TOO_SKEWED";
case Aws::S3::S3Errors::INVALID_SIGNATURE:
return "INVALID_SIGNATURE";
case Aws::S3::S3Errors::SIGNATURE_DOES_NOT_MATCH:
return "SIGNATURE_DOES_NOT_MATCH";
case Aws::S3::S3Errors::INVALID_ACCESS_KEY_ID:
return "INVALID_ACCESS_KEY_ID";
case Aws::S3::S3Errors::REQUEST_TIMEOUT:
return "REQUEST_TIMEOUT";
case Aws::S3::S3Errors::NETWORK_CONNECTION:
return "NETWORK_CONNECTION";
case Aws::S3::S3Errors::UNKNOWN:
return "UNKNOWN";
case Aws::S3::S3Errors::BUCKET_ALREADY_EXISTS:
return "BUCKET_ALREADY_EXISTS";
case Aws::S3::S3Errors::BUCKET_ALREADY_OWNED_BY_YOU:
return "BUCKET_ALREADY_OWNED_BY_YOU";
case Aws::S3::S3Errors::INVALID_OBJECT_STATE:
return "INVALID_OBJECT_STATE";
case Aws::S3::S3Errors::NO_SUCH_BUCKET:
return "NO_SUCH_BUCKET";
case Aws::S3::S3Errors::NO_SUCH_KEY:
return "NO_SUCH_KEY";
case Aws::S3::S3Errors::NO_SUCH_UPLOAD:
return "NO_SUCH_UPLOAD";
case Aws::S3::S3Errors::OBJECT_ALREADY_IN_ACTIVE_TIER:
return "OBJECT_ALREADY_IN_ACTIVE_TIER";
case Aws::S3::S3Errors::OBJECT_NOT_IN_ACTIVE_TIER:
return "OBJECT_NOT_IN_ACTIVE_TIER";
default:
DCHECK(false);
Comment thread
pitrou marked this conversation as resolved.
Outdated
return "[code " + std::to_string(error_type) + "]";
}
}

// TODO qualify error messages with a prefix indicating context
// (e.g. "When completing multipart upload to bucket 'xxx', key 'xxx': ...")
template <typename ErrorType>
Expand All @@ -96,9 +174,9 @@ Status ErrorToStatus(const std::string& prefix, const std::string& operation,
// XXX Handle fine-grained error types
// See
// https://sdk.amazonaws.com/cpp/api/LATEST/namespace_aws_1_1_s3.html#ae3f82f8132b619b6e91c88a9f1bde371
return Status::IOError(prefix, "AWS Error [code ",
static_cast<int>(error.GetErrorType()), "] during ", operation,
" operation: ", error.GetMessage());
return Status::IOError(prefix, "AWS Error ",
S3ErrorToString(static_cast<int>(error.GetErrorType())),
" during ", operation, " operation: ", error.GetMessage());
}

template <typename ErrorType, typename... Args>
Expand Down