{"header":{"message":"Automatically reload $NIX_REMOTE_SYSTEMS when it changes","description":"Otherwise, you'd have to restart the queue runner to add or remove\nmachines.","timestamp":"2015-06-25T10:24:11Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"SODOV2CMWA4JMIKRQNJ6MD3U3BS2XTSLINLRAG4SFY742IIJNI5QC","authors":[],"deps":{"hashes":[["SODOV2CMWA4JMIKRQNJ6MD3U3BS2XTSLINLRAG4SFY742IIJNI5QC","Automatically reload $NIX_REMOTE_SYSTEMS when it changes"],["AA",null],["FKLICOHYATLMF3Q6YBQAOVKBRTCDY2TLKHML3B4DUI7YX4H4MQCAC","Prefer cached failure over unsupported system type"],["ODCBSLFGJGNOMKPZV6TS2SVTQMVUXR3K2BQJHNAJHTR4HECDBBNAC","hydra-queue-runner: Fix segfault sorting machines by load"],["O64P4XJSK56UN73VA5JUAM4RHFDWOZJDDYKVOKMUB736ODOAUYNAC","Keep per-machine stats"],["IE2PRAQUCQVFPJ4CAIJRPXXEFC5VBAE3EO5I5FG4XWEDRNONNHKQC","hydra-queue-runner: Send build notifications"],["MB3TISH2KYBIGY6XJKMN4HO2S6TCN2GORJENMECCKLXGGIRS2O2AC","Rate-limit the number of threads copying closures at the same time"],["T2EIYJNGPIANHKJ4HBJIPTINWKG7RDLHR3PVHFYAPPLHZAJQBVWAC","On SIGINT, shut down the builder threads"],["NNOCZ4ROWC64ZKSAE2MPHZ3LGLI34C5TJJFW4MHXN6OELK6VMWOQC","hydra-queue-runner: Improve dispatcher"],["ENXUSMSVOU3AZFMH2ZXR4ZVPV2LRRQYQJ6IFX33YN6IH2ORSNSAAC","Make concurrency more robust"],["YZAI5GQU3HNMK5MEGF2Y7WS445AN4YKD3HNJQVQP545ODN3F5DLAC","Implement a database connection pool"],["NJJ7H64SZOX5EGACDCQAUQ7R6UEWD5IIC35A2MWFOOJV55DJYPHAC","Very basic multi-threaded queue runner"],["FQQRJUO4C7655SFAKPRPILALVEVRQSIIVBLMQUFPODUBXPIMWYSAC","Mark builds as busy"],["HLSHCK3CP4RB6VO6N44FBHWMXBJYB6XPNWM5EKCKWU3KISU37N3AC","Support requiredSystemFeatures"],["GS4BE6TB6GH2JUZJHDPHL6YG7J7YYESF3YOZJZ2CFABXUTO4VYPQC","Asynchronously compress build logs"],["5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","Basic remote building"],["GKZN4UV75GV7GEHQGBM2O6UHN6CVSHA7BMASCUQSDIDYVUKKZL7AC","Make the queue monitor more robust, and better debug output"],["N5O7VEEOY2IE27VCOYRBG7YCY3K7JMQEDEMRT4OQ2MUE3NWULHHQC","Immediately abort builds that require an unsupported system type"],["HUUZFPPKGHTXFZMZCO2UGWYNGEED3E2CFHQRFQVVBJGPQVGVY4UAC","Fix race between the queue monitor and the builder threads"],["PLOZBRTR6USSGJX7GR2RZKNPVYG2Q6QM7LW6IA35MKL63ZTQVD7QC","Add command ‘hydra-queue-runner --status’ to show current status"],["IWB3F4Z6QZYHQFJ6FWZTGWLCPBYEUTFLUS3F7QT7JOA4DV4YLYGAC","Fail builds with previously failed steps early"],["OCZ4LSGGSCMSLGC3C32D5JUYYHS5CIPOKOAMADEFAFZOFXJ3YY3AC","Automatically retry aborted builds"],["WKJFPR77WNFJHZ65NV3DDMCYYUUWUSI3BHTVCZZDWQI6L3FVP5AQC","hydra-queue-runner: Maintain count of active build steps"],["63W4T5PUSRHU53CVVTVRWAQX6T74RIHH636NCGUGPN3YFVMC3VTAC","hydra-queue-runner: More stats"],["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","Start of single-process hydra-queue-runner"]],"deps":["FKLICOHYATLMF3Q6YBQAOVKBRTCDY2TLKHML3B4DUI7YX4H4MQCAC","ODCBSLFGJGNOMKPZV6TS2SVTQMVUXR3K2BQJHNAJHTR4HECDBBNAC","O64P4XJSK56UN73VA5JUAM4RHFDWOZJDDYKVOKMUB736ODOAUYNAC","IE2PRAQUCQVFPJ4CAIJRPXXEFC5VBAE3EO5I5FG4XWEDRNONNHKQC","MB3TISH2KYBIGY6XJKMN4HO2S6TCN2GORJENMECCKLXGGIRS2O2AC"],"known":["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","NJJ7H64SZOX5EGACDCQAUQ7R6UEWD5IIC35A2MWFOOJV55DJYPHAC","ENXUSMSVOU3AZFMH2ZXR4ZVPV2LRRQYQJ6IFX33YN6IH2ORSNSAAC","T2EIYJNGPIANHKJ4HBJIPTINWKG7RDLHR3PVHFYAPPLHZAJQBVWAC","YZAI5GQU3HNMK5MEGF2Y7WS445AN4YKD3HNJQVQP545ODN3F5DLAC","5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","FQQRJUO4C7655SFAKPRPILALVEVRQSIIVBLMQUFPODUBXPIMWYSAC","N5O7VEEOY2IE27VCOYRBG7YCY3K7JMQEDEMRT4OQ2MUE3NWULHHQC","IWB3F4Z6QZYHQFJ6FWZTGWLCPBYEUTFLUS3F7QT7JOA4DV4YLYGAC","HLSHCK3CP4RB6VO6N44FBHWMXBJYB6XPNWM5EKCKWU3KISU37N3AC","GKZN4UV75GV7GEHQGBM2O6UHN6CVSHA7BMASCUQSDIDYVUKKZL7AC","OCZ4LSGGSCMSLGC3C32D5JUYYHS5CIPOKOAMADEFAFZOFXJ3YY3AC","WKJFPR77WNFJHZ65NV3DDMCYYUUWUSI3BHTVCZZDWQI6L3FVP5AQC","NNOCZ4ROWC64ZKSAE2MPHZ3LGLI34C5TJJFW4MHXN6OELK6VMWOQC","HUUZFPPKGHTXFZMZCO2UGWYNGEED3E2CFHQRFQVVBJGPQVGVY4UAC","GS4BE6TB6GH2JUZJHDPHL6YG7J7YYESF3YOZJZ2CFABXUTO4VYPQC","PLOZBRTR6USSGJX7GR2RZKNPVYG2Q6QM7LW6IA35MKL63ZTQVD7QC","63W4T5PUSRHU53CVVTVRWAQX6T74RIHH636NCGUGPN3YFVMC3VTAC"]},"hunks":[{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":183,"ins":{"up_context":[{"change":7,"pos":6162}],"down_context":[{"change":7,"pos":6}],"flag":"BLOCK","start":0,"end":311,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6162},"to":{"change":4,"start":0,"end":202},"introduced_by":4}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" struct State {"},{"Add":" typedef std::shared_ptr ptr;"},{"Add":" counter currentJobs{0};"},{"Add":" counter nrStepsDone{0};"},{"Add":" counter totalStepTime{0}; // total time for steps, including closure copying"},{"Add":" counter totalStepBuildTime{0}; // total build time for steps"},{"Add":" };"},{"Add":""},{"Add":" State::ptr state;"}],"del_contents":[{"Del":" counter currentJobs{0};\n counter nrStepsDone{0};\n counter totalStepTime{0}; // total time for steps, including closure copying\n counter totalStepBuildTime{0}; // total build time for steps\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":201,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":190},"to":{"change":7,"start":745,"end":751},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6293},"to":{"change":7,"start":745,"end":751},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":745},"to":{"change":7,"start":745,"end":751},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":751},"to":{"change":7,"start":6097,"end":6102},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6097},"to":{"change":7,"start":6097,"end":6102},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6102},"to":{"change":7,"start":6294,"end":6549},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6549},"to":{"change":7,"start":69,"end":101},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":101},"to":{"change":7,"start":6632,"end":6670},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6632},"to":{"change":7,"start":6632,"end":6670},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6670},"to":{"change":7,"start":102,"end":134},"introduced_by":7}],"inode":{"change":7,"pos":4840}}},"contents":[{"Del":" }\n"},{"Del":"};\n\n\n"},{"Del":"/* A RAII helper that manages the currentJobs field of Machine\n objects. */\nstruct MachineReservation\n{\n typedef std::shared_ptr ptr;\n Machine::ptr machine;\n MachineReservation(Machine::ptr machine) : machine(machine)\n {\n"},{"Del":" machine->currentJobs++;\n"},{"Del":" }\n ~MachineReservation()\n {\n"},{"Del":" machine->currentJobs--;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":234,"ins":{"up_context":[{"change":7,"pos":6970}],"down_context":[{"change":7,"pos":7016}],"flag":"BLOCK","start":312,"end":365,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6970},"to":{"change":7,"start":6970,"end":7016},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" typedef std::map Machines;"}],"del_contents":[{"Del":" typedef std::list Machines;\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":236,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7045}],"down_context":[{"change":6,"pos":987}],"flag":"BLOCK","start":366,"end":424,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":""},{"Add":" Path machinesFile;"},{"Add":" struct stat machinesFileStat;"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":279,"ins":{"up_context":[{"change":7,"pos":901}],"down_context":[{"change":7,"pos":6539}],"flag":"BLOCK","start":425,"end":584,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":901},"to":{"change":7,"start":901,"end":926},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" /* (Re)load /etc/nix/machines. */"},{"Add":" void loadMachinesFile();"},{"Add":""},{"Add":" /* Thread to reload /etc/nix/machines periodically. */"},{"Add":" void monitorMachinesFile();"}],"del_contents":[{"Del":" void loadMachines();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":314,"ins":{"up_context":[{"change":7,"pos":7328}],"down_context":[{"change":7,"pos":7633}],"flag":"BLOCK","start":585,"end":685,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7562},"to":{"change":7,"start":7562,"end":7633},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" void builder(Step::ptr step, Machine::ptr machine, std::shared_ptr reservation);"}],"del_contents":[{"Del":" void builder(Step::ptr step, MachineReservation::ptr reservation);\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":355,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7892}],"down_context":[{"change":7,"pos":7503}],"flag":"BLOCK","start":686,"end":825,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":""},{"Add":" machinesFile = getEnv(\"NIX_REMOTE_SYSTEMS\", \"/etc/nix/machines\");"},{"Add":" machinesFileStat.st_ino = 0;"},{"Add":" machinesFileStat.st_mtime = 0;"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":362,"ins":{"up_context":[{"change":7,"pos":7507}],"down_context":[{"change":7,"pos":7922}],"flag":"BLOCK","start":826,"end":857,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7895},"to":{"change":7,"start":7895,"end":7922},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":"void State::loadMachinesFile()"}],"del_contents":[{"Del":"void State::loadMachines()\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":364,"ins":{"up_context":[{"change":7,"pos":7924}],"down_context":[{"change":7,"pos":8027}],"flag":"BLOCK","start":858,"end":879,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7924},"to":{"change":7,"start":7924,"end":7999},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":7999},"to":{"change":7,"start":7731,"end":7732},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7731},"to":{"change":7,"start":7731,"end":7732},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7732},"to":{"change":7,"start":8000,"end":8027},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" string contents;"}],"del_contents":[{"Del":" Path machinesFile = getEnv(\"NIX_REMOTE_SYSTEMS\", \"/etc/nix/machines\");\n"},{"Del":"\n"},{"Del":" Machines newMachines;\n\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":366,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":8063}],"down_context":[{"change":7,"pos":8063}],"flag":"BLOCK","start":880,"end":1579,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":" struct stat st;"},{"Add":" if (stat(machinesFile.c_str(), &st) != 0)"},{"Add":" throw SysError(format(\"getting stats about ‘%1%’\") % machinesFile);"},{"Add":" if (st.st_ino == machinesFileStat.st_ino && st.st_mtime == machinesFileStat.st_mtime)"},{"Add":" return;"},{"Add":" printMsg(lvlDebug, \"reloading machines\");"},{"Add":" contents = readFile(machinesFile);"},{"Add":" machinesFileStat = st;"},{"Add":" } else {"},{"Add":" StringSet systems = StringSet({settings.thisSystem});"},{"Add":" if (settings.thisSystem == \"x86_64-linux\")"},{"Add":" systems.insert(\"i686-linux\");"},{"Add":" contents = \"localhost \" + concatStringsSep(\",\", systems)"},{"Add":" + \" - \" + int2String(settings.maxBuildJobs) + \" 1\";"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":382,"ins":{"up_context":[{"change":7,"pos":8064}],"down_context":[{"change":7,"pos":8353}],"flag":"BLOCK","start":1580,"end":1706,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8064},"to":{"change":7,"start":8064,"end":8353},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" Machines newMachines, oldMachines;"},{"Add":" {"},{"Add":" auto machines_(machines.lock());"},{"Add":" oldMachines = *machines_;"},{"Add":" }"}],"del_contents":[{"Del":" for (auto line : tokenizeString(readFile(machinesFile), \"\\n\")) {\n line = trim(string(line, 0, line.find('#')));\n auto tokens = tokenizeString>(line);\n if (tokens.size() < 3) continue;\n tokens.resize(7);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":388,"ins":{"up_context":[{"change":7,"pos":8354}],"down_context":[{"change":7,"pos":7732}],"flag":"BLOCK","start":1707,"end":1962,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8354},"to":{"change":7,"start":8354,"end":8944},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8944},"to":{"change":7,"start":339,"end":449},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":449},"to":{"change":7,"start":8944,"end":8998},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8944},"to":{"change":7,"start":8944,"end":8998},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" for (auto line : tokenizeString(contents, \"\\n\")) {"},{"Add":" line = trim(string(line, 0, line.find('#')));"},{"Add":" auto tokens = tokenizeString>(line);"},{"Add":" if (tokens.size() < 3) continue;"},{"Add":" tokens.resize(7);"}],"del_contents":[{"Del":" auto machine = std::make_shared();\n machine->sshName = tokens[0];\n machine->systemTypes = tokenizeString(tokens[1], \",\");\n machine->sshKey = tokens[2];\n if (tokens[3] != \"\")\n string2Int(tokens[3], machine->maxJobs);\n else\n machine->maxJobs = 1;\n machine->speedFactor = atof(tokens[4].c_str());\n machine->supportedFeatures = tokenizeString(tokens[5], \",\");\n machine->mandatoryFeatures = tokenizeString(tokens[6], \",\");\n"},{"Del":" for (auto & f : machine->mandatoryFeatures)\n machine->supportedFeatures.insert(f);\n"},{"Del":" newMachines.push_back(machine);\n }\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":394,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7733},"to":{"change":7,"start":8999,"end":9012},"introduced_by":7}],"inode":{"change":7,"pos":4840}}},"contents":[{"Del":" } else {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":395,"ins":{"up_context":[{"change":7,"pos":9064}],"down_context":[{"change":7,"pos":9365}],"flag":"BLOCK","start":1963,"end":3115,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9064},"to":{"change":7,"start":9064,"end":9365},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" machine->sshName = tokens[0];"},{"Add":" machine->systemTypes = tokenizeString(tokens[1], \",\");"},{"Add":" machine->sshKey = tokens[2];"},{"Add":" if (tokens[3] != \"\")"},{"Add":" string2Int(tokens[3], machine->maxJobs);"},{"Add":" else"},{"Add":" machine->maxJobs = 1;"},{"Add":" machine->speedFactor = atof(tokens[4].c_str());"},{"Add":" machine->supportedFeatures = tokenizeString(tokens[5], \",\");"},{"Add":" machine->mandatoryFeatures = tokenizeString(tokens[6], \",\");"},{"Add":" for (auto & f : machine->mandatoryFeatures)"},{"Add":" machine->supportedFeatures.insert(f);"},{"Add":""},{"Add":" /* Re-use the State object of the previous machine with the"},{"Add":" same name. */"},{"Add":" auto i = oldMachines.find(machine->sshName);"},{"Add":" if (i == oldMachines.end())"},{"Add":" printMsg(lvlChatty, format(\"adding new machine ‘%1%’\") % machine->sshName);"},{"Add":" else"},{"Add":" printMsg(lvlChatty, format(\"updating machine ‘%1%’\") % machine->sshName);"},{"Add":" machine->state = i == oldMachines.end()"},{"Add":" ? std::make_shared()"},{"Add":" : i->second->state;"},{"Add":" newMachines[machine->sshName] = machine;"}],"del_contents":[{"Del":" machine->sshName = \"localhost\";\n machine->systemTypes = StringSet({settings.thisSystem});\n if (settings.thisSystem == \"x86_64-linux\")\n machine->systemTypes.insert(\"i686-linux\");\n machine->maxJobs = settings.maxBuildJobs;\n newMachines.push_back(machine);\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":420,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":9371}],"down_context":[{"change":7,"pos":9371}],"flag":"BLOCK","start":3116,"end":3289,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":""},{"Add":" for (auto & m : oldMachines)"},{"Add":" if (newMachines.find(m.first) == newMachines.end())"},{"Add":" printMsg(lvlInfo, format(\"removing machine ‘%1%’\") % m.first);"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":427,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":9439}],"down_context":[{"change":7,"pos":9439}],"flag":"BLOCK","start":3290,"end":3591,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":"}"},{"Add":""},{"Add":""},{"Add":"void State::monitorMachinesFile()"},{"Add":"{"},{"Add":" while (true) {"},{"Add":" try {"},{"Add":" // FIXME: use inotify."},{"Add":" sleep(60);"},{"Add":" loadMachinesFile();"},{"Add":" } catch (std::exception & e) {"},{"Add":" printMsg(lvlError, format(\"reloading machines file: %1%\") % e.what());"},{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":658,"ins":{"up_context":[{"change":2,"pos":230}],"down_context":[{"change":2,"pos":307}],"flag":"BLOCK","start":3592,"end":3676,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":230},"to":{"change":2,"start":230,"end":307},"introduced_by":2}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" if (m.second->supportsStep(r)) { supported = true; break; }"}],"del_contents":[{"Del":" if (m->supportsStep(r)) { supported = true; break; }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":935,"ins":{"up_context":[{"change":3,"pos":442}],"down_context":[{"change":7,"pos":466}],"flag":"BLOCK","start":3677,"end":3765,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":442},"to":{"change":3,"start":442,"end":509},"introduced_by":3}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" machinesSorted.push_back({m.second, m.second->state->currentJobs});"}],"del_contents":[{"Del":" machinesSorted.push_back({m, m->currentJobs});\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":968,"ins":{"up_context":[{"change":7,"pos":1882}],"down_context":[{"change":7,"pos":1954}],"flag":"BLOCK","start":3766,"end":3851,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1882},"to":{"change":3,"start":972,"end":1050},"introduced_by":3}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" if (mi.machine->state->currentJobs >= mi.machine->maxJobs) continue;"}],"del_contents":[{"Del":" if (mi.machine->currentJobs >= mi.machine->maxJobs) continue;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1005,"ins":{"up_context":[{"change":7,"pos":3244}],"down_context":[{"change":7,"pos":3330}],"flag":"BLOCK","start":3852,"end":3956,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3244},"to":{"change":3,"start":1111,"end":1200},"introduced_by":3}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" auto reservation = std::make_shared(mi.machine->state->currentJobs);"}],"del_contents":[{"Del":" auto reservation = std::make_shared(mi.machine);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1008,"ins":{"up_context":[{"change":7,"pos":3376}],"down_context":[{"change":7,"pos":3472}],"flag":"BLOCK","start":3957,"end":4065,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3376},"to":{"change":7,"start":3376,"end":3472},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" auto builderThread = std::thread(&State::builder, this, step, mi.machine, reservation);"}],"del_contents":[{"Del":" auto builderThread = std::thread(&State::builder, this, step, reservation);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1042,"ins":{"up_context":[{"change":7,"pos":12578}],"down_context":[{"change":7,"pos":12651}],"flag":"BLOCK","start":4066,"end":4168,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":12578},"to":{"change":7,"start":12578,"end":12651},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":"void State::builder(Step::ptr step, Machine::ptr machine, std::shared_ptr reservation)"}],"del_contents":[{"Del":"void State::builder(Step::ptr step, MachineReservation::ptr reservation)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1050,"ins":{"up_context":[{"change":7,"pos":12712}],"down_context":[{"change":7,"pos":12768}],"flag":"BLOCK","start":4169,"end":4220,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":12712},"to":{"change":7,"start":2750,"end":2814},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" retry = doBuildStep(store, step, machine);"}],"del_contents":[{"Del":" retry = doBuildStep(store, step, reservation->machine);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1053,"ins":{"up_context":[{"change":7,"pos":2908}],"down_context":[{"change":7,"pos":12955}],"flag":"BLOCK","start":4221,"end":4281,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2908},"to":{"change":7,"start":2908,"end":2981},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" % step->drvPath % machine->sshName % e.what());"}],"del_contents":[{"Del":" % step->drvPath % reservation->machine->sshName % e.what());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1398,"ins":{"up_context":[{"change":7,"pos":526}],"down_context":[{"change":7,"pos":526}],"flag":"BLOCK","start":4282,"end":4462,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":526},"to":{"change":4,"start":273,"end":432},"introduced_by":4}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" machine->state->nrStepsDone++;"},{"Add":" machine->state->totalStepTime += stepStopTime - stepStartTime;"},{"Add":" machine->state->totalStepBuildTime += result.stopTime - result.startTime;"}],"del_contents":[{"Del":" machine->nrStepsDone++;\n machine->totalStepTime += stepStopTime - stepStartTime;\n machine->totalStepBuildTime += result.stopTime - result.startTime;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1603,"ins":{"up_context":[{"change":7,"pos":1754}],"down_context":[{"change":7,"pos":1796}],"flag":"BLOCK","start":4463,"end":4577,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1754},"to":{"change":7,"start":1754,"end":1796},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" for (auto & i : *machines_) {"},{"Add":" auto & m(i.second);"},{"Add":" auto & s(m->state);"}],"del_contents":[{"Del":" for (auto & m : *machines_) {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1608,"ins":{"up_context":[{"change":7,"pos":1878}],"down_context":[{"change":4,"pos":1087}],"flag":"BLOCK","start":4578,"end":5101,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1878},"to":{"change":7,"start":1878,"end":1939},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1939},"to":{"change":4,"start":632,"end":1087},"introduced_by":4}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" nested2.attr(\"currentJobs\", s->currentJobs);"},{"Add":" nested2.attr(\"nrStepsDone\", s->nrStepsDone);"},{"Add":" if (m->state->nrStepsDone) {"},{"Add":" nested2.attr(\"totalStepTime\", s->totalStepTime);"},{"Add":" nested2.attr(\"totalStepBuildTime\", s->totalStepBuildTime);"},{"Add":" nested2.attr(\"avgStepTime\"); out << (float) s->totalStepTime / s->nrStepsDone;"},{"Add":" nested2.attr(\"avgStepBuildTime\"); out << (float) s->totalStepBuildTime / s->nrStepsDone;"}],"del_contents":[{"Del":" nested2.attr(\"currentJobs\", m->currentJobs);\n"},{"Del":" nested2.attr(\"nrStepsDone\", m->nrStepsDone);\n if (m->nrStepsDone) {\n nested2.attr(\"totalStepTime\", m->totalStepTime);\n nested2.attr(\"totalStepBuildTime\", m->totalStepBuildTime);\n nested2.attr(\"avgStepTime\"); out << (float) m->totalStepTime / m->nrStepsDone;\n nested2.attr(\"avgStepBuildTime\"); out << (float) m->totalStepBuildTime / m->nrStepsDone;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1711,"ins":{"up_context":[{"change":7,"pos":3286}],"down_context":[{"change":7,"pos":3363}],"flag":"BLOCK","start":5102,"end":5126,"inode":{"change":7,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3286},"to":{"change":7,"start":14685,"end":14705},"introduced_by":7}],"inode":{"change":7,"pos":4840}},"ins_contents":[{"Add":" loadMachinesFile();"}],"del_contents":[{"Del":" loadMachines();\n"}]}},{"Edit":{"inode":{"change":7,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":1713,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3364}],"down_context":[{"change":5,"pos":2667}],"flag":"BLOCK","start":5127,"end":5189,"inode":{"change":7,"pos":4840}}},"contents":[{"Add":" std::thread(&State::monitorMachinesFile, this).detach();"},{"Add":""}]}}],"owner":"grahamc","repo":"hydra2","token":"Q9d3gJrTWrJGU2Jat2AIM5Q+p6vrcXyitMD6mI3NQik=","login":null}

…

Dependencies

Change contents