vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Better AWS error messages

Browse source
This commit is contained in:
Eelco Dolstra 2016-02-26 22:40:27 +01:00
parent 1693354506
commit 610a8d67ae
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/hydra-queue-runner/s3-binary-cache-store.cc
View file

@ -22,12 +22,12 @@ struct S3Error : public Error
/* Helper: given an Outcome<R, E>, return R in case of success, or /* Helper: given an Outcome<R, E>, return R in case of success, or
throw an exception in case of an error. */ throw an exception in case of an error. */
template<typename R, typename E> template<typename R, typename E>
R && checkAws(Aws::Utils::Outcome<R, E> && outcome) R && checkAws(const FormatOrString & fs, Aws::Utils::Outcome<R, E> && outcome)
{ {
if (!outcome.IsSuccess()) if (!outcome.IsSuccess())
throw S3Error( throw S3Error(
outcome.GetError().GetErrorType(), outcome.GetError().GetErrorType(),
format("AWS error: %1%") % outcome.GetError().GetMessage()); fs.s + ": " + outcome.GetError().GetMessage());
return outcome.GetResultWithOwnership(); return outcome.GetResultWithOwnership();
} }
@ -59,15 +59,16 @@ void S3BinaryCacheStore::init()
if (!res.IsSuccess()) { if (!res.IsSuccess()) {
if (res.GetError().GetErrorType() != Aws::S3::S3Errors::NO_SUCH_BUCKET) if (res.GetError().GetErrorType() != Aws::S3::S3Errors::NO_SUCH_BUCKET)
throw Error(format("AWS error: %1%") % res.GetError().GetMessage()); throw Error(format("AWS error checking bucket ‘%s’: %s") % bucketName % res.GetError().GetMessage());
checkAws(client->CreateBucket( checkAws(format("AWS error creating bucket ‘%s’") % bucketName,
Aws::S3::Model::CreateBucketRequest() client->CreateBucket(
.WithBucket(bucketName) Aws::S3::Model::CreateBucketRequest()
.WithCreateBucketConfiguration( .WithBucket(bucketName)
Aws::S3::Model::CreateBucketConfiguration() .WithCreateBucketConfiguration(
/* .WithLocationConstraint( Aws::S3::Model::CreateBucketConfiguration()
Aws::S3::Model::BucketLocationConstraint::US) */ ))); /* .WithLocationConstraint(
Aws::S3::Model::BucketLocationConstraint::US) */ )));
} }
BinaryCacheStore::init(); BinaryCacheStore::init();
@ -107,7 +108,7 @@ bool S3BinaryCacheStore::fileExists(const std::string & path)
if (error.GetErrorType() == Aws::S3::S3Errors::UNKNOWN // FIXME if (error.GetErrorType() == Aws::S3::S3Errors::UNKNOWN // FIXME
&& error.GetMessage().find("404") != std::string::npos) && error.GetMessage().find("404") != std::string::npos)
return false; return false;
throw Error(format("AWS error: %1%") % error.GetMessage()); throw Error(format("AWS error fetching ‘%s’") % path % error.GetMessage());
} }
return true; return true;
@ -129,7 +130,8 @@ void S3BinaryCacheStore::upsertFile(const std::string & path, const std::string
auto now1 = std::chrono::steady_clock::now(); auto now1 = std::chrono::steady_clock::now();
auto result = checkAws(client->PutObject(request)); auto result = checkAws(format("AWS error uploading ‘%s’") % path,
client->PutObject(request));
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();
@ -156,7 +158,8 @@ std::string S3BinaryCacheStore::getFile(const std::string & path)
auto now1 = std::chrono::steady_clock::now(); auto now1 = std::chrono::steady_clock::now();
auto result = checkAws(client->GetObject(request)); auto result = checkAws(format("AWS error fetching ‘%s’") % path,
client->GetObject(request));
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();
@ -164,7 +167,7 @@ std::string S3BinaryCacheStore::getFile(const std::string & path)
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count(); auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();
printMsg(lvlInfo, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms") printMsg(lvlTalkative, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms")
% bucketName % path % res.size() % duration); % bucketName % path % res.size() % duration);
stats.getBytes += res.size(); stats.getBytes += res.size();