grahamc/hydra - Change RX6UB7YWLTJXJTFHFHU3W4W5LZIFHZJ4E6WGACPTQONBROFCNWNQC

Better AWS error messages

Created by Eelco Dolstra on February 26, 2016

RX6UB7YWLTJXJTFHFHU3W4W5LZIFHZJ4E6WGACPTQONBROFCNWNQC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 25 [5.1297]

B:BD[5.1804] → [5.1804:1856]

R && checkAws(Aws::Utils::Outcome<R, E> && outcome)

[5.1804]

[5.1856]

R && checkAws(const FormatOrString & fs, Aws::Utils::Outcome<R, E> && outcome)

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 30 [5.1297]

B:BD[2.296] → [2.296:369]

            format("AWS error: %1%") % outcome.GetError().GetMessage());

[2.296]

[5.1969]

            fs.s + ": " + outcome.GetError().GetMessage());

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 62 [5.1297]

B:BD[5.3014] → [5.3014:3095]

            throw Error(format("AWS error: %1%") % res.GetError().GetMessage());

[5.3014]

[5.3095]

            throw Error(format("AWS error checking bucket ‘%s’: %s") % bucketName % res.GetError().GetMessage());

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 64 [5.1297]

B:BD[5.3096] → [5.3096:3325]

B:BD[5.3325] → [3.43:161]

        checkAws(client->CreateBucket(
            Aws::S3::Model::CreateBucketRequest()
            .WithBucket(bucketName)
            .WithCreateBucketConfiguration(
                Aws::S3::Model::CreateBucketConfiguration()
                /* .WithLocationConstraint(
                    Aws::S3::Model::BucketLocationConstraint::US) */ )));

[5.3096]

[5.3443]

        checkAws(format("AWS error creating bucket ‘%s’") % bucketName,
            client->CreateBucket(
                Aws::S3::Model::CreateBucketRequest()
                .WithBucket(bucketName)
                .WithCreateBucketConfiguration(
                    Aws::S3::Model::CreateBucketConfiguration()
                    /* .WithLocationConstraint(
                       Aws::S3::Model::BucketLocationConstraint::US) */ )));

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 111 [5.1297]

B:BD[5.3917] → [5.3917:3985]

        throw Error(format("AWS error: %1%") % error.GetMessage());

[5.3917]

[5.3985]

        throw Error(format("AWS error fetching ‘%s’") % path % error.GetMessage());

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 133 [5.1297]

B:BD[5.4364] → [5.4364:4420]

    auto result = checkAws(client->PutObject(request));

[5.4364]

[5.4420]

    auto result = checkAws(format("AWS error uploading ‘%s’") % path,
        client->PutObject(request));

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 161 [5.1297]

B:BD[5.5047] → [5.5047:5103]

    auto result = checkAws(client->GetObject(request));

[5.5047]

[5.5103]

    auto result = checkAws(format("AWS error fetching ‘%s’") % path,
        client->GetObject(request));

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 170 [5.1297]

B:BD[5.5230] → [4.83:167]

    printMsg(lvlInfo, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms")

[5.5230]

[6.5367]

    printMsg(lvlTalkative, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms")