grahamc/hydra - Change EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC

Use a single BinaryCacheStore for all threads

This will make it easier to do caching / keep stats. Also, we won't have S3Client's connection pooling if we create multiple S3Client instances.

Created by Eelco Dolstra on February 18, 2016

EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/hydra-queue-runner/binary-cache-store.cc at line 14 [3.1879]

B:BD[3.2032] → [4.105:163]

BinaryCacheStore::BinaryCacheStore(ref<Store> localStore,

[3.2032]

[5.307]

BinaryCacheStore::BinaryCacheStore(const StoreFactory & storeFactory,

Replacement in src/hydra-queue-runner/binary-cache-store.cc at line 16 [3.1879]
B:BD[5.367] → [5.367:396]
```
    : localStore(localStore)
```
[5.367]
[3.2180]
```
    : storeFactory(storeFactory)
```
Insertion in src/hydra-queue-runner/binary-cache-store.cc at line 194 [3.1879]
[3.8015]
[3.8015]
```
    auto localStore = storeFactory();
```
Insertion in src/hydra-queue-runner/binary-cache-store.cc at line 215 [3.1879]
[3.8569]
[3.8569]
```
    auto localStore = storeFactory();
```

Insertion in src/hydra-queue-runner/binary-cache-store.hh at line 9 [3.9253]

[5.2138]

[3.9309]


/* While BinaryCacheStore is thread-safe, LocalStore and RemoteStore
   aren't. Until they are, use a factory to produce a thread-local
   local store. */
typedef std::function<ref<Store>()> StoreFactory;

Deletion in src/hydra-queue-runner/binary-cache-store.hh at line 19 [3.9253]
∅:D[4.955] → [3.9364:9391]
B:BD[3.9364] → [3.9364:9391]
B:BD[3.9416] → [5.2139:2140]
```
    ref<Store> localStore;
```
Insertion in src/hydra-queue-runner/binary-cache-store.hh at line 22 [3.9253]
[3.9417]
[4.956]
```
    StoreFactory storeFactory;
```
Replacement in src/hydra-queue-runner/binary-cache-store.hh at line 26 [3.9253]
B:BD[3.9426] → [4.968:1012]
```
    BinaryCacheStore(ref<Store> localStore,
```
[3.9426]
[5.2300]
```
    BinaryCacheStore(const StoreFactory & storeFactory,
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 26 [7.4840]

[6.7892]

[3.1542]


#if 0
    auto store = make_ref<LocalBinaryCacheStore>(getLocalStore(),
        "/home/eelco/Misc/Keys/test.nixos.org/secret",
        "/home/eelco/Misc/Keys/test.nixos.org/public",
        "/tmp/binary-cache");
#endif
    auto store = std::make_shared<S3BinaryCacheStore>(
        []() { return openStore(); },
        "/home/eelco/Misc/Keys/test.nixos.org/secret",
        "/home/eelco/Misc/Keys/test.nixos.org/public",
        "nix-test-cache-3");;
    store->init();
    _destStore = store;

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 52 [7.4840]

B:BD[3.1660] → [2.747:753]

∅:D[2.753] → [4.1357:1423]

B:BD[3.1660] → [4.1357:1423]

B:BD[4.1423] → [2.754:964]

∅:D[2.964] → [5.84:139]

B:BD[5.84] → [5.84:139]

B:BD[5.139] → [2.965:1049]

∅:D[2.1049] → [4.1424:1461]

B:BD[5.195] → [4.1424:1461]

#if 0
    auto store = make_ref<LocalBinaryCacheStore>(getLocalStore(),
        "/home/eelco/Misc/Keys/test.nixos.org/secret",
        "/home/eelco/Misc/Keys/test.nixos.org/public",
        "/tmp/binary-cache");
#endif
    auto store = make_ref<S3BinaryCacheStore>(getLocalStore(),
        "/home/eelco/Misc/Keys/test.nixos.org/secret",
        "/home/eelco/Misc/Keys/test.nixos.org/public",
        "nix-test-cache-3");
    store->init();
    return store;

[3.1660]

[7.7503]

    return ref<Store>(_destStore);

Replacement in src/hydra-queue-runner/local-binary-cache-store.cc at line 5 [4.1463]

B:BD[4.1521] → [4.1521:1589]

LocalBinaryCacheStore::LocalBinaryCacheStore(ref<Store> localStore,

[4.1521]

[2.1050]

LocalBinaryCacheStore::LocalBinaryCacheStore(const StoreFactory & storeFactory,

Replacement in src/hydra-queue-runner/local-binary-cache-store.cc at line 8 [4.1463]
∅:D[2.1143] → [4.1679:1744]
B:BD[4.1679] → [4.1679:1744]
```
    : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)
```
[2.1143]
[4.1744]
```
    : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)
```
Replacement in src/hydra-queue-runner/local-binary-cache-store.hh at line 15 [4.2672]
B:BD[4.2839] → [2.1144:1193]
```
    LocalBinaryCacheStore(ref<Store> localStore,
```
[4.2839]
[2.1193]
```
    LocalBinaryCacheStore(const StoreFactory & storeFactory,
```

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

B:BD[2.2017] → [2.2017:2079]

S3BinaryCacheStore::S3BinaryCacheStore(ref<Store> localStore,

[2.2017]

[2.2079]

S3BinaryCacheStore::S3BinaryCacheStore(const StoreFactory & storeFactory,

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

B:BD[2.2175] → [2.2175:2240]

    : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)

[2.2175]

[2.2240]

    : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)

Replacement in src/hydra-queue-runner/s3-binary-cache-store.hh at line 21 [2.5519]
B:BD[2.5890] → [2.5890:5936]
```
    S3BinaryCacheStore(ref<Store> localStore,
```
[2.5890]
[2.5936]
```
    S3BinaryCacheStore(const StoreFactory & storeFactory,
```

Insertion in src/hydra-queue-runner/state.hh at line 349 [8.1128]

[8.6778]

    /* Destination store. */
    std::shared_ptr<nix::Store> _destStore;

Use a single BinaryCacheStore for all threads

Dependencies

In channels

Change contents

Replacement in src/hydra-queue-runner/binary-cache-store.cc at line 14 [3.1879]

Replacement in src/hydra-queue-runner/binary-cache-store.cc at line 16 [3.1879]

Insertion in src/hydra-queue-runner/binary-cache-store.cc at line 194 [3.1879]

Insertion in src/hydra-queue-runner/binary-cache-store.cc at line 215 [3.1879]

Insertion in src/hydra-queue-runner/binary-cache-store.hh at line 9 [3.9253]

Deletion in src/hydra-queue-runner/binary-cache-store.hh at line 19 [3.9253]

Insertion in src/hydra-queue-runner/binary-cache-store.hh at line 22 [3.9253]

Replacement in src/hydra-queue-runner/binary-cache-store.hh at line 26 [3.9253]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 26 [7.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 52 [7.4840]

Replacement in src/hydra-queue-runner/local-binary-cache-store.cc at line 5 [4.1463]

Replacement in src/hydra-queue-runner/local-binary-cache-store.cc at line 8 [4.1463]

Replacement in src/hydra-queue-runner/local-binary-cache-store.hh at line 15 [4.2672]

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

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

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

Insertion in src/hydra-queue-runner/state.hh at line 349 [8.1128]