{"header":{"message":"Remove the `sendDerivation` logic from the builder","description":"The queue runner used to special-case `localhost` as a remote builder:\nRather than using the normal remote-build (using the\n`cmdBuildDerivation` command), it was using the (generally less\nefficient, except when running against localhost) `cmdBuildPaths`\ncommand because the latter didn't require a privileged Nix user (so made\ntesting easier − allowing to run hydra in a container in particular).\n\nHowever:\n1. this means that the build loop can follow two discint code paths depending\n on the setup, the irony being that the most commonly used one in production\n (the “non-localhost” case) isn't the one used in the testsuite (because all\n the tests run against a local store);\n2. It turns out that the “localhost” version is buggy in relatively obvious\n ways − in particular a failure in a fixed-output derivation or a hash\n mismatch isn't reported properly;\n3. If the “run in a container” use-case is indeed that important, it can be\n (partially) restored using a chroot store (which wouldn't behave excactly\n the same way of course, but would be more than good-enough for testing)","timestamp":"2021-02-23T08:50:15Z","authors":[{"email":"rg@regnat.ovh","name":"regnat"}]},"hash":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC","authors":[],"deps":{"hashes":[["TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC","Remove the `sendDerivation` logic from the builder"],["AA",null],["J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC","Get exact build start/stop times from the remote"],["FNWNZYKURCR4YEGMPQADOD3FE4CA4ZRU34KVLP5GA75PI7GOX23QC","Fix localhost builds"],["YVFKZFAP7JQWQ5ROYNEDXTLGWNZ2ZJ6I5OAYLWBMQBWOQE5XQAVQC","Fix build"],["G7KWXSFMFPFSCJ7ZD4Z6RNZSDHMHTOUDO3G6R6GYO6VDUDPMIKDQC","Distinguish build step states"],["EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC","Build against nix-master"],["YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC","Fix build"],["BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC","Temporarily disable machines on any exception, not just connection failures"],["6LA56M376Q3C7VHNBJ26VX6VERQCRXYXPP4EA55WQY4A4FFTTORQC","Fix build against current Nix master"],["AUMIJSEOUDEGOCN3YSBD7KXOWE2CD2HN2VHS54FWUBMGRUBJHDXQC","Fix remote building on Nix 1.10"],["HH3LID6L4WJZV6NEDVCLPCO6KF2NLUUV3VJPFNJUQZCIESK3JYSQC","Re-implement log size limits"],["BG6PEOB2M2Y56QPVMELU7VNNCGNMSQ2K6ATBUCPJLKPLTDWNJQ5AC","Make the output size limit configurable"],["VZKB5CIEW7Z5YBRYFKIFBQODBCG2NPGGXU3F3VQ3BNKGP5WYCPBQC","Workaround for RemoteStore not supporting cmdBuildDerivation yet"],["EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC","Allow determinism checking for entire jobsets"],["EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC","Support testing build determinism"],["2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC","hydra-queue-runner: Support running in a NixOS container"],["5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","Basic remote building"],["NAYQT2GTCJPBFRSK7CBFX655F2NGTBPICJSCYG2CSCQ5NRDHZG6QC","hydra-queue-runner: Use cmdBuildDerivation"],["WV4SSAIYM4SVBQ2VISDTAXQJCPKRGTLSVFH44CQFEMC4COWG5OKQC","Build against nix-master"],["EVSK5TBBG44BIYIYP4I62AMZGLP2UBFI5KIHWZAJIOQYDEXXYFCQC","Fix version test"],["H46LUUZY3N7DDOIZFDZ7SJP76BICH4G6Z4SC7GBPMIKHW2JPZRTAC","hydra-queue-runner: don't try to distribute builds on localhost"]],"deps":["J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC","FNWNZYKURCR4YEGMPQADOD3FE4CA4ZRU34KVLP5GA75PI7GOX23QC"],"known":["5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","NAYQT2GTCJPBFRSK7CBFX655F2NGTBPICJSCYG2CSCQ5NRDHZG6QC","VZKB5CIEW7Z5YBRYFKIFBQODBCG2NPGGXU3F3VQ3BNKGP5WYCPBQC","AUMIJSEOUDEGOCN3YSBD7KXOWE2CD2HN2VHS54FWUBMGRUBJHDXQC","HH3LID6L4WJZV6NEDVCLPCO6KF2NLUUV3VJPFNJUQZCIESK3JYSQC","BG6PEOB2M2Y56QPVMELU7VNNCGNMSQ2K6ATBUCPJLKPLTDWNJQ5AC","BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC","6LA56M376Q3C7VHNBJ26VX6VERQCRXYXPP4EA55WQY4A4FFTTORQC","EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC","EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC","EVSK5TBBG44BIYIYP4I62AMZGLP2UBFI5KIHWZAJIOQYDEXXYFCQC","G7KWXSFMFPFSCJ7ZD4Z6RNZSDHMHTOUDO3G6R6GYO6VDUDPMIKDQC","2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC","WV4SSAIYM4SVBQ2VISDTAXQJCPKRGTLSVFH44CQFEMC4COWG5OKQC","EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC","H46LUUZY3N7DDOIZFDZ7SJP76BICH4G6Z4SC7GBPMIKHW2JPZRTAC","YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC","YVFKZFAP7JQWQ5ROYNEDXTLGWNZ2ZJ6I5OAYLWBMQBWOQE5XQAVQC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":213,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":328},"to":{"change":4,"start":328,"end":364},"introduced_by":4}],"inode":{"change":4,"pos":85}}},"contents":[{"Del":{"text":" bool sendDerivation = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:363"}}]}},{"Edit":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":225,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":776},"to":{"change":4,"start":39,"end":352},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":917},"to":{"change":4,"start":39,"end":352},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":352},"to":{"change":4,"start":973,"end":1013},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":973},"to":{"change":4,"start":973,"end":1013},"introduced_by":4}],"inode":{"change":4,"pos":85}}},"contents":[{"Del":{"text":" // Always send the derivation to localhost, since it's a","pos":"2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC:107"}},{"Del":{"text":" // no-op anyway but we might not be privileged to use","pos":"2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC:173"}},{"Del":{"text":" // cmdBuildDerivation (e.g. if we're running in a NixOS","pos":"2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC:241"}},{"Del":{"text":" // container).","pos":"2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC:268"}},{"Del":{"text":" if (GET_PROTOCOL_MINOR(remoteVersion) >= 1 && !machine->isLocalhost())","pos":"2GRQJZT6YNH32ZAXX3OALH7Z3XU3YTPH4SBTMG5ZZ373KHYFXZ7AC:351"}},{"Del":{"text":" sendDerivation = false;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:1012"}}]}},{"Replacement":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":249,"ins":{"up_context":[{"change":4,"pos":651}],"down_context":[{"change":4,"pos":797}],"flag":"BLOCK","start":0,"end":76,"inode":{"change":4,"pos":85}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":651},"to":{"change":4,"start":1703,"end":1731},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1731},"to":{"change":4,"start":860,"end":902},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":891},"to":{"change":4,"start":1773,"end":1786},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":902},"to":{"change":4,"start":1773,"end":1786},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1398},"to":{"change":4,"start":1773,"end":1786},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1773},"to":{"change":4,"start":1773,"end":1786},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1786},"to":{"change":4,"start":892,"end":942},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":942},"to":{"change":4,"start":903,"end":937},"introduced_by":4}],"inode":{"change":4,"pos":85}},"ins_contents":[{"Add":{"text":" for (auto & p : step->drv->inputSrcs)","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:45"}},{"Add":{"text":" inputs.insert(p);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:75"}}],"del_contents":[{"Del":{"text":" if (sendDerivation)","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:1730"}},{"Del":{"text":" inputs.insert(step->drvPath);","pos":"YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC:901"}},{"Del":{"text":" else","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:1785"}},{"Del":{"text":" for (auto & p : step->drv->inputSrcs)","pos":"WV4SSAIYM4SVBQ2VISDTAXQJCPKRGTLSVFH44CQFEMC4COWG5OKQC:941"}},{"Del":{"text":" inputs.insert(p);","pos":"YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC:936"}}]}},{"Replacement":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":306,"ins":{"up_context":[{"change":4,"pos":355}],"down_context":[{"change":4,"pos":3615}],"flag":"BLOCK","start":77,"end":208,"inode":{"change":4,"pos":85}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":355},"to":{"change":4,"start":2174,"end":2237},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2237},"to":{"change":3,"start":0,"end":79},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":79},"to":{"change":4,"start":2309,"end":2475},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":4,"pos":232},"to":{"change":4,"start":2309,"end":2475},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1108},"to":{"change":4,"start":2309,"end":2475},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2309},"to":{"change":4,"start":2309,"end":2475},"introduced_by":4}],"inode":{"change":4,"pos":85}},"ins_contents":[{"Add":{"text":" to << cmdBuildDerivation << localStore->printStorePath(step->drvPath);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:155"}},{"Add":{"text":" writeDerivation(to, *localStore, basicDrv);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:207"}}],"del_contents":[{"Del":{"text":" if (sendDerivation) {","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2203"}},{"Del":{"text":" to << cmdBuildPaths;","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2236"}},{"Del":{"text":" worker_proto::write(*localStore, to, StorePathSet{step->drvPath});","pos":"FNWNZYKURCR4YEGMPQADOD3FE4CA4ZRU34KVLP5GA75PI7GOX23QC:78"}},{"Del":{"text":" } else {","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2325"}},{"Del":{"text":" to << cmdBuildDerivation << localStore->printStorePath(step->drvPath);","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2408"}},{"Del":{"text":" writeDerivation(to, *localStore, basicDrv);","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2464"}},{"Del":{"text":" }","pos":"EBJP3MNAC4CRYGMJJHMKUYWTXP3N4WMMORRLDSDHQVF5ZLOTIENQC:2474"}}]}},{"Replacement":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":325,"ins":{"up_context":[{"change":4,"pos":1154}],"down_context":[{"change":4,"pos":333}],"flag":"BLOCK","start":209,"end":724,"inode":{"change":4,"pos":85}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1154},"to":{"change":4,"start":3975,"end":4028},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4028},"to":{"change":4,"start":1109,"end":1202},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1202},"to":{"change":4,"start":4136,"end":4551},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4136},"to":{"change":4,"start":4136,"end":4551},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":4551},"to":{"change":4,"start":116,"end":130},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":116},"to":{"change":4,"start":116,"end":130},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":130},"to":{"change":4,"start":4552,"end":4660},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4660},"to":{"change":4,"start":259,"end":427},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":427},"to":{"change":2,"start":0,"end":360},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":360},"to":{"change":4,"start":427,"end":441},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":427},"to":{"change":4,"start":427,"end":441},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":441},"to":{"change":4,"start":4660,"end":5695},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4660},"to":{"change":4,"start":4660,"end":5695},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5945},"to":{"change":4,"start":5945,"end":6391},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6391},"to":{"change":4,"start":428,"end":656},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":656},"to":{"change":4,"start":6391,"end":6521},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6391},"to":{"change":4,"start":6391,"end":6521},"introduced_by":4}],"inode":{"change":4,"pos":85}},"ins_contents":[{"Add":{"text":" result.errorMsg = readString(from);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:252"}},{"Add":{"text":" if (GET_PROTOCOL_MINOR(remoteVersion) >= 3) {","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:306"}},{"Add":{"text":" result.timesBuilt = readInt(from);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:353"}},{"Add":{"text":" result.isNonDeterministic = readInt(from);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:408"}},{"Add":{"text":" auto start = readInt(from);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:448"}},{"Add":{"text":" auto stop = readInt(from);","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:487"}},{"Add":{"text":" if (start && start) {","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:521"}},{"Add":{"text":" /* Note: this represents the duration of a single","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:587"}},{"Add":{"text":" round, rather than all rounds. */","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:641"}},{"Add":{"text":" result.startTime = start;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:683"}},{"Add":{"text":" result.stopTime = stop;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:723"}}],"del_contents":[{"Del":{"text":" if (sendDerivation) {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4004"}},{"Del":{"text":" if (res) {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4027"}},{"Del":{"text":" result.errorMsg = fmt(\"%s on ‘%s’\", readString(from), machine->sshName);","pos":"YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC:1201"}},{"Del":{"text":" if (res == 100) {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4169"}},{"Del":{"text":" result.stepStatus = bsFailed;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4219"}},{"Del":{"text":" result.canCache = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4263"}},{"Del":{"text":" }","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4281"}},{"Del":{"text":" else if (res == 101) {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4320"}},{"Del":{"text":" result.stepStatus = bsTimedOut;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4372"}},{"Del":{"text":" }","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4390"}},{"Del":{"text":" else {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4413"}},{"Del":{"text":" result.stepStatus = bsAborted;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4464"}},{"Del":{"text":" result.canRetry = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4508"}},{"Del":{"text":" }","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4526"}},{"Del":{"text":" return;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4550"}},{"Del":{"text":" }","pos":"BG6PEOB2M2Y56QPVMELU7VNNCGNMSQ2K6ATBUCPJLKPLTDWNJQ5AC:129"}},{"Del":{"text":" result.stepStatus = bsSuccess;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4594"}},{"Del":{"text":" } else {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4611"}},{"Del":{"text":" result.errorMsg = readString(from);","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4659"}},{"Del":{"text":" if (GET_PROTOCOL_MINOR(remoteVersion) >= 3) {","pos":"EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC:316"}},{"Del":{"text":" result.timesBuilt = readInt(from);","pos":"EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC:367"}},{"Del":{"text":" result.isNonDeterministic = readInt(from);","pos":"EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC:426"}},{"Del":{"text":" auto start = readInt(from);","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:43"}},{"Del":{"text":" auto stop = readInt(from);","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:86"}},{"Del":{"text":" if (start && start) {","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:124"}},{"Del":{"text":" /* Note: this represents the duration of a single","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:194"}},{"Del":{"text":" round, rather than all rounds. */","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:251"}},{"Del":{"text":" result.startTime = start;","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:297"}},{"Del":{"text":" result.stopTime = stop;","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:341"}},{"Del":{"text":" }","pos":"J5YPMWCJCTBMNR67TSQSJKJPACOBFQJ5NHFUCP3QHT6FMPH4TXMAC:359"}},{"Del":{"text":" }","pos":"EPWEMRI23UN6C777AL2GWEOXYZRTPEPFC2SZVZ4JTWUGYVFDL5XAC:440"}},{"Del":{"text":" switch ((BuildResult::Status) res) {","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4708"}},{"Del":{"text":" case BuildResult::Built:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4749"}},{"Del":{"text":" result.stepStatus = bsSuccess;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4800"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4827"}},{"Del":{"text":" case BuildResult::Substituted:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4874"}},{"Del":{"text":" case BuildResult::AlreadyValid:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4922"}},{"Del":{"text":" result.stepStatus = bsSuccess;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:4973"}},{"Del":{"text":" result.isCached = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5017"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5044"}},{"Del":{"text":" case BuildResult::PermanentFailure:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5096"}},{"Del":{"text":" result.stepStatus = bsFailed;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5146"}},{"Del":{"text":" result.canCache = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5190"}},{"Del":{"text":" result.errorMsg = \"\";","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5232"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5259"}},{"Del":{"text":" case BuildResult::InputRejected:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5308"}},{"Del":{"text":" case BuildResult::OutputRejected:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5358"}},{"Del":{"text":" result.stepStatus = bsFailed;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5408"}},{"Del":{"text":" result.canCache = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5452"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5479"}},{"Del":{"text":" case BuildResult::TransientFailure:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5531"}},{"Del":{"text":" result.stepStatus = bsFailed;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5581"}},{"Del":{"text":" result.canRetry = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5625"}},{"Del":{"text":" result.errorMsg = \"\";","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5667"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5694"}},{"Del":{"text":" case BuildResult::TimedOut:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:5988"}},{"Del":{"text":" result.stepStatus = bsTimedOut;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6040"}},{"Del":{"text":" result.errorMsg = \"\";","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6082"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6109"}},{"Del":{"text":" case BuildResult::MiscFailure:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6156"}},{"Del":{"text":" result.stepStatus = bsAborted;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6207"}},{"Del":{"text":" result.canRetry = true;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6251"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6278"}},{"Del":{"text":" case BuildResult::LogLimitExceeded:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6330"}},{"Del":{"text":" result.stepStatus = bsLogLimitExceeded;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6390"}},{"Del":{"text":" break;","pos":"EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC:454"}},{"Del":{"text":" case BuildResult::NotDeterministic:","pos":"EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC:506"}},{"Del":{"text":" result.stepStatus = bsNotDeterministic;","pos":"EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC:566"}},{"Del":{"text":" result.canRetry = false;","pos":"EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC:611"}},{"Del":{"text":" result.canCache = true;","pos":"EFWDY2V7ILJBFQ6NADBESYZTPHQBXKNO5N4DPNABL7X4XMNNTNYAC:655"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6417"}},{"Del":{"text":" default:","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6442"}},{"Del":{"text":" result.stepStatus = bsAborted;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6493"}},{"Del":{"text":" break;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6520"}}]}},{"Replacement":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":337,"ins":{"up_context":[{"change":4,"pos":347}],"down_context":[{"change":4,"pos":1529}],"flag":"BLOCK","start":725,"end":2402,"inode":{"change":4,"pos":85}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":347},"to":{"change":4,"start":6522,"end":6578},"introduced_by":4}],"inode":{"change":4,"pos":85}},"ins_contents":[{"Add":{"text":" }","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:734"}},{"Add":{"text":" switch ((BuildResult::Status) res) {","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:779"}},{"Add":{"text":" case BuildResult::Built:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:816"}},{"Add":{"text":" result.stepStatus = bsSuccess;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:863"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:886"}},{"Add":{"text":" case BuildResult::Substituted:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:929"}},{"Add":{"text":" case BuildResult::AlreadyValid:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:973"}},{"Add":{"text":" result.stepStatus = bsSuccess;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1020"}},{"Add":{"text":" result.isCached = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1060"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1083"}},{"Add":{"text":" case BuildResult::PermanentFailure:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1131"}},{"Add":{"text":" result.stepStatus = bsFailed;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1177"}},{"Add":{"text":" result.canCache = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1217"}},{"Add":{"text":" result.errorMsg = \"\";","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1255"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1278"}},{"Add":{"text":" case BuildResult::InputRejected:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1323"}},{"Add":{"text":" case BuildResult::OutputRejected:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1369"}},{"Add":{"text":" result.stepStatus = bsFailed;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1415"}},{"Add":{"text":" result.canCache = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1455"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1478"}},{"Add":{"text":" case BuildResult::TransientFailure:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1526"}},{"Add":{"text":" result.stepStatus = bsFailed;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1572"}},{"Add":{"text":" result.canRetry = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1612"}},{"Add":{"text":" result.errorMsg = \"\";","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1650"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1673"}},{"Add":{"text":" case BuildResult::TimedOut:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1713"}},{"Add":{"text":" result.stepStatus = bsTimedOut;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1761"}},{"Add":{"text":" result.errorMsg = \"\";","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1799"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1822"}},{"Add":{"text":" case BuildResult::MiscFailure:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1865"}},{"Add":{"text":" result.stepStatus = bsAborted;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1912"}},{"Add":{"text":" result.canRetry = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1952"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:1975"}},{"Add":{"text":" case BuildResult::LogLimitExceeded:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2023"}},{"Add":{"text":" result.stepStatus = bsLogLimitExceeded;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2079"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2102"}},{"Add":{"text":" case BuildResult::NotDeterministic:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2150"}},{"Add":{"text":" result.stepStatus = bsNotDeterministic;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2206"}},{"Add":{"text":" result.canRetry = false;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2247"}},{"Add":{"text":" result.canCache = true;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2287"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2310"}},{"Add":{"text":" default:","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2331"}},{"Add":{"text":" result.stepStatus = bsAborted;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2378"}},{"Add":{"text":" break;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2401"}}],"del_contents":[{"Del":{"text":" if (result.stepStatus != bsSuccess) return;","pos":"BYVRA54QBKHLFOPIRBJKZZI7JYBYHSOK7MIA3TUZTALZQJGG3G7QC:6577"}}]}},{"Edit":{"inode":{"change":4,"pos":85},"path":"src/hydra-queue-runner/build-remote.cc","line":382,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1539}],"down_context":[{"change":4,"pos":6579}],"flag":"BLOCK","start":2403,"end":2455,"inode":{"change":4,"pos":85}}},"contents":[{"Add":{"text":" if (result.stepStatus != bsSuccess) return;","pos":"TJWMCLXXJY7ZZTNCM2B5KAINSQN46NECSXFFF4Y7XIVZKB3TO7SAC:2454"}}]}}],"owner":"grahamc","repo":"hydra2","token":"Tw8DWnKzKyNWKAzFe1Tpa+W/u5SO5am15XPSskxazsY=","login":null}

…

Dependencies

Change contents

Review