{"header":{"message":"Use a single BinaryCacheStore for all threads","description":"This will make it easier to do caching / keep stats. Also, we won't\nhave S3Client's connection pooling if we create multiple S3Client\ninstances.","timestamp":"2016-02-18T16:31:19Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC","authors":[],"deps":{"hashes":[["EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC","Use a single BinaryCacheStore for all threads"],["AA",null],["GTUZLZRHJ6GL5BNXOO3GA6Y3GFO7AXLIVPQHSG26LCF42KC2N7LQC","Add an S3-backed binary cache store"],["N2NKSKHSFR6SDMGZO2ALNDVIOLOEE26BPQHCSWUGEFE3DVVVV4MAC","Refactor local binary cache code into a subclass"],["32HHP5CWAWJB2Q3Q6HYEC66YFGQAV6ESU7VEQ5ENBAQ5ZCRP4KGAC","hydra-queue-runner: Support generating a signed binary cache"],["5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","Basic remote building"],["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","Start of single-process hydra-queue-runner"],["73YR46NJNYZQKHA3QDJCAZYAKC2CGEF5LIS44NOIPDZU6FX6BDPQC","hydra-queue-runner: Write directly to a binary cache"],["W2AOTSS6ZFJZBF3IZKWFXHFW5H4DNGLWCEDJTLMFWVAXL46SNM7QC","Rename class"],["ZM34T2NWCTGWBQ5PWIWDJTRKJLCIX3HZHRWCVQGO7OCKTKMXXMSQC","Typo"],["HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC","Refactor"]],"deps":["GTUZLZRHJ6GL5BNXOO3GA6Y3GFO7AXLIVPQHSG26LCF42KC2N7LQC"],"known":["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","73YR46NJNYZQKHA3QDJCAZYAKC2CGEF5LIS44NOIPDZU6FX6BDPQC","32HHP5CWAWJB2Q3Q6HYEC66YFGQAV6ESU7VEQ5ENBAQ5ZCRP4KGAC","W2AOTSS6ZFJZBF3IZKWFXHFW5H4DNGLWCEDJTLMFWVAXL46SNM7QC","N2NKSKHSFR6SDMGZO2ALNDVIOLOEE26BPQHCSWUGEFE3DVVVV4MAC","ZM34T2NWCTGWBQ5PWIWDJTRKJLCIX3HZHRWCVQGO7OCKTKMXXMSQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":14,"ins":{"up_context":[{"change":3,"pos":2032}],"down_context":[{"change":3,"pos":307}],"flag":"BLOCK","start":0,"end":70,"inode":{"change":3,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2032},"to":{"change":3,"start":105,"end":163},"introduced_by":3}],"inode":{"change":3,"pos":1879}},"ins_contents":[{"Add":"BinaryCacheStore::BinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":"BinaryCacheStore::BinaryCacheStore(ref localStore,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":16,"ins":{"up_context":[{"change":3,"pos":367}],"down_context":[{"change":3,"pos":2180}],"flag":"BLOCK","start":71,"end":104,"inode":{"change":3,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":367},"to":{"change":3,"start":367,"end":396},"introduced_by":3}],"inode":{"change":3,"pos":1879}},"ins_contents":[{"Add":" : storeFactory(storeFactory)"}],"del_contents":[{"Del":" : localStore(localStore)\n"}]}},{"Edit":{"inode":{"change":3,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":194,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8015}],"down_context":[{"change":3,"pos":8015}],"flag":"BLOCK","start":105,"end":144,"inode":{"change":3,"pos":1879}}},"contents":[{"Add":""},{"Add":" auto localStore = storeFactory();"}]}},{"Edit":{"inode":{"change":3,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":215,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8569}],"down_context":[{"change":3,"pos":8569}],"flag":"BLOCK","start":145,"end":184,"inode":{"change":3,"pos":1879}}},"contents":[{"Add":" auto localStore = storeFactory();"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":9,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2138}],"down_context":[{"change":3,"pos":9309}],"flag":"BLOCK","start":185,"end":391,"inode":{"change":3,"pos":9253}}},"contents":[{"Add":""},{"Add":"/* While BinaryCacheStore is thread-safe, LocalStore and RemoteStore"},{"Add":" aren't. Until they are, use a factory to produce a thread-local"},{"Add":" local store. */"},{"Add":"typedef std::function()> StoreFactory;"}]}},{"Edit":{"inode":{"change":3,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":19,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":955},"to":{"change":3,"start":9364,"end":9391},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9364},"to":{"change":3,"start":9364,"end":9391},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9416},"to":{"change":3,"start":2139,"end":2140},"introduced_by":3}],"inode":{"change":3,"pos":9253}}},"contents":[{"Del":" ref localStore;\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":3,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":22,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":9417}],"down_context":[{"change":3,"pos":956}],"flag":"BLOCK","start":392,"end":424,"inode":{"change":3,"pos":9253}}},"contents":[{"Add":" StoreFactory storeFactory;"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":26,"ins":{"up_context":[{"change":3,"pos":9426}],"down_context":[{"change":3,"pos":2300}],"flag":"BLOCK","start":425,"end":481,"inode":{"change":3,"pos":9253}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9426},"to":{"change":3,"start":968,"end":1012},"introduced_by":3}],"inode":{"change":3,"pos":9253}},"ins_contents":[{"Add":" BinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":" BinaryCacheStore(ref localStore,\n"}]}},{"Edit":{"inode":{"change":3,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":26,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7892}],"down_context":[{"change":3,"pos":1542}],"flag":"BLOCK","start":482,"end":979,"inode":{"change":3,"pos":4840}}},"contents":[{"Add":""},{"Add":"#if 0"},{"Add":" auto store = make_ref(getLocalStore(),"},{"Add":" \"/home/eelco/Misc/Keys/test.nixos.org/secret\","},{"Add":" \"/home/eelco/Misc/Keys/test.nixos.org/public\","},{"Add":" \"/tmp/binary-cache\");"},{"Add":"#endif"},{"Add":""},{"Add":" auto store = std::make_shared("},{"Add":" []() { return openStore(); },"},{"Add":" \"/home/eelco/Misc/Keys/test.nixos.org/secret\","},{"Add":" \"/home/eelco/Misc/Keys/test.nixos.org/public\","},{"Add":" \"nix-test-cache-3\");;"},{"Add":" store->init();"},{"Add":" _destStore = store;"}]}},{"Replacement":{"inode":{"change":3,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":52,"ins":{"up_context":[{"change":3,"pos":1660}],"down_context":[{"change":3,"pos":7503}],"flag":"BLOCK","start":980,"end":1015,"inode":{"change":3,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1660},"to":{"change":2,"start":747,"end":753},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":753},"to":{"change":3,"start":1357,"end":1423},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1660},"to":{"change":3,"start":1357,"end":1423},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1423},"to":{"change":2,"start":754,"end":964},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":964},"to":{"change":3,"start":84,"end":139},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84},"to":{"change":3,"start":84,"end":139},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":139},"to":{"change":2,"start":965,"end":1049},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1049},"to":{"change":3,"start":1424,"end":1461},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":195},"to":{"change":3,"start":1424,"end":1461},"introduced_by":3}],"inode":{"change":3,"pos":4840}},"ins_contents":[{"Add":" return ref(_destStore);"}],"del_contents":[{"Del":"#if 0\n"},{"Del":" auto store = make_ref(getLocalStore(),\n"},{"Del":" \"/home/eelco/Misc/Keys/test.nixos.org/secret\",\n \"/home/eelco/Misc/Keys/test.nixos.org/public\",\n \"/tmp/binary-cache\");\n#endif\n auto store = make_ref(getLocalStore(),\n"},{"Del":" \"/home/eelco/Misc/Keys/test.nixos.org/secret\",\n"},{"Del":" \"/home/eelco/Misc/Keys/test.nixos.org/public\",\n \"nix-test-cache-3\");\n"},{"Del":" store->init();\n return store;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1463},"path":"src/hydra-queue-runner/local-binary-cache-store.cc","line":5,"ins":{"up_context":[{"change":3,"pos":1521}],"down_context":[{"change":2,"pos":1050}],"flag":"BLOCK","start":1016,"end":1096,"inode":{"change":3,"pos":1463}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1521},"to":{"change":3,"start":1521,"end":1589},"introduced_by":3}],"inode":{"change":3,"pos":1463}},"ins_contents":[{"Add":"LocalBinaryCacheStore::LocalBinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":"LocalBinaryCacheStore::LocalBinaryCacheStore(ref localStore,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1463},"path":"src/hydra-queue-runner/local-binary-cache-store.cc","line":8,"ins":{"up_context":[{"change":2,"pos":1143}],"down_context":[{"change":3,"pos":1744}],"flag":"BLOCK","start":1097,"end":1164,"inode":{"change":3,"pos":1463}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":1143},"to":{"change":3,"start":1679,"end":1744},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1679},"to":{"change":3,"start":1679,"end":1744},"introduced_by":3}],"inode":{"change":3,"pos":1463}},"ins_contents":[{"Add":" : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)"}],"del_contents":[{"Del":" : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":2672},"path":"src/hydra-queue-runner/local-binary-cache-store.hh","line":15,"ins":{"up_context":[{"change":3,"pos":2839}],"down_context":[{"change":2,"pos":1193}],"flag":"BLOCK","start":1165,"end":1226,"inode":{"change":3,"pos":2672}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2839},"to":{"change":2,"start":1144,"end":1193},"introduced_by":2}],"inode":{"change":3,"pos":2672}},"ins_contents":[{"Add":" LocalBinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":" LocalBinaryCacheStore(ref localStore,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":1297},"path":"src/hydra-queue-runner/s3-binary-cache-store.cc","line":23,"ins":{"up_context":[{"change":2,"pos":2017}],"down_context":[{"change":2,"pos":2079}],"flag":"BLOCK","start":1227,"end":1301,"inode":{"change":2,"pos":1297}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2017},"to":{"change":2,"start":2017,"end":2079},"introduced_by":2}],"inode":{"change":2,"pos":1297}},"ins_contents":[{"Add":"S3BinaryCacheStore::S3BinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":"S3BinaryCacheStore::S3BinaryCacheStore(ref localStore,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":1297},"path":"src/hydra-queue-runner/s3-binary-cache-store.cc","line":26,"ins":{"up_context":[{"change":2,"pos":2175}],"down_context":[{"change":2,"pos":2240}],"flag":"BLOCK","start":1302,"end":1369,"inode":{"change":2,"pos":1297}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2175},"to":{"change":2,"start":2175,"end":2240},"introduced_by":2}],"inode":{"change":2,"pos":1297}},"ins_contents":[{"Add":" : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)"}],"del_contents":[{"Del":" : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":5519},"path":"src/hydra-queue-runner/s3-binary-cache-store.hh","line":21,"ins":{"up_context":[{"change":2,"pos":5890}],"down_context":[{"change":2,"pos":5936}],"flag":"BLOCK","start":1370,"end":1428,"inode":{"change":2,"pos":5519}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5890},"to":{"change":2,"start":5890,"end":5936},"introduced_by":2}],"inode":{"change":2,"pos":5519}},"ins_contents":[{"Add":" S3BinaryCacheStore(const StoreFactory & storeFactory,"}],"del_contents":[{"Del":" S3BinaryCacheStore(ref localStore,\n"}]}},{"Edit":{"inode":{"change":11,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":349,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":6778}],"down_context":[{"change":11,"pos":6778}],"flag":"BLOCK","start":1429,"end":1503,"inode":{"change":11,"pos":1128}}},"contents":[{"Add":" /* Destination store. */"},{"Add":" std::shared_ptr _destStore;"},{"Add":""}]}}],"owner":"grahamc","repo":"hydra2","token":"u+bE4JIjDOiUJODtnR6LfyCbyJShYJduksqorzAEGEg=","login":null}

…

Dependencies

Change contents