Fix build

[?]
Mar 4, 2016, 4:51 PM
DXFMYCNWLWBW7CX4QEGSZHSFQOPDXIDEERZ4QZ6OVGDO3OCFJ76QC

Dependencies

  • [2] B2L4T3X6 Sync with Nix
  • [3] V2UCCYN3 hydra-queue-runner: Get store mode configuration from hydra.conf
  • [4] EOO4EFWD Use a single BinaryCacheStore for all threads
  • [5] E5YNZACS Fix build
  • [6] GTUZLZRH Add an S3-backed binary cache store
  • [7] SOB276BA Keep some statistics for the binary cache stores
  • [8] K5G5GZY7 Guard against concurrent invocations of hydra-queue-runner
  • [*] 24BMQDZA Start of single-process hydra-queue-runner

Change contents

  • edit in src/hydra-queue-runner/hydra-queue-runner.cc at line 776
    [2.977][2.977:1034]()
    hydraConfig["binary_cache_public_key_file"],
  • edit in src/hydra-queue-runner/hydra-queue-runner.cc at line 786
    [3.1640][3.1640:1697]()
    hydraConfig["binary_cache_public_key_file"],
  • replacement in src/hydra-queue-runner/s3-binary-cache-store.cc at line 35
    [3.1301][3.2079:2175](),[2.1425][3.2079:2175](),[3.2079][3.2079:2175](),[3.2175][2.1426:1491]()
    const Path & secretKeyFile, const Path & publicKeyFile,
    const std::string & bucketName)
    : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)
    [2.1425]
    [3.2240]
    const Path & secretKeyFile, const std::string & bucketName)
    : BinaryCacheStore(localStore, secretKeyFile)
  • edit in src/hydra-queue-runner/s3-binary-cache-store.cc at line 179
    [3.5467][3.5467:5468]()
  • replacement in src/hydra-queue-runner/s3-binary-cache-store.hh at line 24
    [3.1428][3.5936:6041](),[2.1550][3.5936:6041](),[3.5936][3.5936:6041]()
    const Path & secretKeyFile, const Path & publicKeyFile,
    const std::string & bucketName);
    [2.1550]
    [3.6041]
    const Path & secretKeyFile, const std::string & bucketName);