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

Suppress "will retry in N ms" for non-retriable errors

Browse source 
Newer versions of aws-sdk-cpp call CalculateDelayBeforeNextRetry()
even for non-retriable errors (like NoSuchKey) whih causes log spam in
hydra-queue-runner.
This commit is contained in:
Eelco Dolstra 2017-06-19 18:13:32 +02:00
parent 00aa7c6705
commit 1c969611ba
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/s3-binary-cache-store.cc
View file

@ -86,12 +86,13 @@ S3Helper::S3Helper(const string & region)
/* Log AWS retries. */ /* Log AWS retries. */
class RetryStrategy : public Aws::Client::DefaultRetryStrategy class RetryStrategy : public Aws::Client::DefaultRetryStrategy
{ {
long CalculateDelayBeforeNextRetry(const Aws::Client::AWSError<Aws::Client::CoreErrors>& error, long attemptedRetries) const override bool ShouldRetry(const Aws::Client::AWSError<Aws::Client::CoreErrors>& error, long attemptedRetries) const override
{ {
auto res = Aws::Client::DefaultRetryStrategy::CalculateDelayBeforeNextRetry(error, attemptedRetries); auto retry = Aws::Client::DefaultRetryStrategy::ShouldRetry(error, attemptedRetries);
printError("AWS error '%s' (%s), will retry in %d ms", if (retry)
error.GetExceptionName(), error.GetMessage(), res); printError("AWS error '%s' (%s), will retry in %d ms",
return res; error.GetExceptionName(), error.GetMessage(), CalculateDelayBeforeNextRetry(error, attemptedRetries));
return retry;
} }
}; };