grahamc/hydra - Change US3QQSHJVDIESJAHI5WAIRHTIPEGXHVVY4EOEK7M5YPCUWKW7RAAC

Updates for negative .narinfo caching

Created by Eelco Dolstra on April 15, 2016

US3QQSHJVDIESJAHI5WAIRHTIPEGXHVVY4EOEK7M5YPCUWKW7RAAC

Dependencies

In channels

main

upstream

Change contents

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 642 [5.4840]
[3.917]
[4.2053]
```
            nested.attr("narInfoMissing", stats.narInfoMissing);
```

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

B:BD[6.743] → [6.743:853]

    } catch (S3Error & e) {
        if (e.err == Aws::S3::S3Errors::NO_SUCH_KEY) return false;
        throw;

[6.743]

[6.853]

    } catch (InvalidPath & e) {
        return false;

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

B:BD[7.4695] → [7.4695:4761]

std::string S3BinaryCacheStore::getFile(const std::string & path)

[7.4695]

[7.4761]

std::shared_ptr<std::string> S3BinaryCacheStore::getFile(const std::string & path)

Replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 159 [7.1297]
∅:D[4.5268] → [7.4996:5046]
B:BD[7.4996] → [7.4996:5046]
```
    auto now1 = std::chrono::steady_clock::now();
```
[4.5268]
[7.5046]
```
    try {
```

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

B:BD[7.5047] → [2.903:1013]

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

[7.5047]

[7.5103]

        auto now1 = std::chrono::steady_clock::now();

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

B:BD[7.5104] → [7.5104:5154]

    auto now2 = std::chrono::steady_clock::now();

[7.5104]

[7.5154]

        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 166 [7.1297]

B:BD[7.5155] → [7.5155:5229]

    auto res = dynamic_cast<std::stringstream &>(result.GetBody()).str();

[7.5155]

[4.5269]

        auto now2 = std::chrono::steady_clock::now();

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

B:BD[4.5270] → [4.5270:5366]

    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();

[4.5270]

[7.5229]

        auto res = dynamic_cast<std::stringstream &>(result.GetBody()).str();

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

B:BD[7.5230] → [2.1014:1103]

∅:D[8.167] → [4.5367:5421]

∅:D[2.1103] → [4.5367:5421]

B:BD[9.85] → [4.5367:5421]

    printMsg(lvlTalkative, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms")
        % bucketName % path % res.size() % duration);

[7.5230]

[4.5421]

        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();

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

B:BD[4.5422] → [4.5422:5489]

    stats.getBytes += res.size();
    stats.getTimeMs += duration;

[4.5422]

[7.5445]

        printMsg(lvlTalkative, format("downloaded ‘s3://%1%/%2%’ (%3% bytes) in %4% ms")
            % bucketName % path % res.size() % duration);

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

B:BD[7.5446] → [7.5446:5462]

    return res;

[7.5446]

[7.5462]

        stats.getBytes += res.size();
        stats.getTimeMs += duration;
        return std::make_shared<std::string>(res);
    } catch (S3Error & e) {
        if (e.err == Aws::S3::S3Errors::NO_SUCH_KEY) return 0;
        throw;
    }

Replacement in src/hydra-queue-runner/s3-binary-cache-store.hh at line 55 [7.5519]

B:BD[7.6288] → [7.6288:6348]

    std::string getFile(const std::string & path) override;

[7.6288]

[7.6348]

    std::shared_ptr<std::string> getFile(const std::string & path) override;