{"header":{"message":"machine-status: Read /etc/nix.machines instead of using the BuildMachines table","description":null,"timestamp":"2013-03-04T20:37:20Z","authors":[{"email":"shea@shealevy.com","name":"Shea Levy"}]},"hash":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC","authors":[],"deps":{"hashes":[["HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC","machine-status: Read /etc/nix.machines instead of using the BuildMachines table"],["AA",null],["R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC","Allow non-admin users to see the machine status page"],["V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC","Formatting tweaks"],["U5ZWDBW3XRWDWMMPSSXEZ3DT47FPX5WH74AZ4URVQHHAD7ZOB46AC","Ensure that each eval is compared to the previous one from the same jobset"],["EFWN7JBV7YIHNMCA6ZGFRSHZIUQJ2EX57SWYGVT7ZRJCHPIM2R3QC","* Added a status page that shows all the currently executing build steps."],["FPK5LF53CFUEKFYJ3IYXT4UTVC6IITWJOCFATMC4PLHEUP5SIEAAC","* Put the project-related actions in a separate controller. Put the"],["SMCOU72FKTPFNCDXFJAILVUWFE4DY33CJJE4436H5POKENFFDFFAC","hydra: add some admin for adding/enabling/etc build machines"],["PMNWRTGJ4GVSMSSAWSUD57B26PCRAHMZIQ5SIWJIK7A74ENKEQLAC","Add multiple output support"],["BDSD2JLV4V4I52SE7MCZLYNDC4XU27ZNH7TYKLT7CA7YR5WRMQBAC","* Speed up manifest generation."],["VH5ZABDRP565VZIG55YHNYYPST53NQ2J6YM362NSLXCAHI5WPH4AC","Add a page to show the latest evaluations for the entire server"],["J5UVLXOK6EDIL5I7VKWH4V2QDS4DPD7FHRK6XBWSXFRQS4JKXFZQC","* Start of a basic Catalyst web interface."],["2GK5DOU7ODF4WBSN3QTD3WIO52VTL2LOAXKGCDEMMAQPTEO4A4HAC","* Downloading closures."],["ZWCTAZGLJZQNTYWTC2XQUKMILJF6JGDL5IND6QNYWK4FIGMLRFXAC","added newsitems, added some admin options to clear various caches."]],"deps":["R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC","V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC","U5ZWDBW3XRWDWMMPSSXEZ3DT47FPX5WH74AZ4URVQHHAD7ZOB46AC"],"known":["BDSD2JLV4V4I52SE7MCZLYNDC4XU27ZNH7TYKLT7CA7YR5WRMQBAC","FPK5LF53CFUEKFYJ3IYXT4UTVC6IITWJOCFATMC4PLHEUP5SIEAAC","EFWN7JBV7YIHNMCA6ZGFRSHZIUQJ2EX57SWYGVT7ZRJCHPIM2R3QC","SMCOU72FKTPFNCDXFJAILVUWFE4DY33CJJE4436H5POKENFFDFFAC","PMNWRTGJ4GVSMSSAWSUD57B26PCRAHMZIQ5SIWJIK7A74ENKEQLAC","VH5ZABDRP565VZIG55YHNYYPST53NQ2J6YM362NSLXCAHI5WPH4AC"]},"hunks":[{"Replacement":{"inode":{"change":12,"pos":804},"path":"src/lib/Hydra/Controller/Root.pm","line":77,"ins":{"up_context":[{"change":2,"pos":55}],"down_context":[{"change":2,"pos":416}],"flag":"BLOCK","start":0,"end":391,"inode":{"change":12,"pos":804}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":55},"to":{"change":2,"start":55,"end":416},"introduced_by":2}],"inode":{"change":12,"pos":804}},"ins_contents":[{"Add":{"text":" my $machines = getMachines;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:31"}},{"Add":{"text":" my $idles = $c->model('DB::BuildSteps')->search(","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:84"}},{"Add":{"text":" { stoptime => { '!=', undef } },","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:129"}},{"Add":{"text":" { select => [ 'machine', { max => 'stoptime', -as => 'max_stoptime' }], group_by => \"machine\" });","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:239"}},{"Add":{"text":" while (my $idle = $idles->next) {","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:277"}},{"Add":{"text":" ${$machines}{$idle->machine}{'idle'} = $idle->max_stoptime;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:345"}},{"Add":{"text":" }","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:351"}},{"Add":{"text":" $c->stash->{machines} = $machines;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:390"}}],"del_contents":[{"Del":{"text":" $c->stash->{machines} = [$c->model('DB::BuildMachines')->search(","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:123"}},{"Del":{"text":" {},","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:135"}},{"Del":{"text":" { order_by => [\"enabled DESC\", \"hostname\"]","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:186"}},{"Del":{"text":" , '+select' => [\"(select bs.stoptime from buildsteps as bs where bs.machine = (me.username || '\\@' || me.hostname) and not bs.stoptime is null order by bs.stoptime desc limit 1)\"]","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:374"}},{"Del":{"text":" , '+as' => ['idle']","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:402"}},{"Del":{"text":" })];","pos":"R2PON6R7RJT63XVKGEXAIKB76RHIQL3WCDTZQM5JLKAZ7B5AZAFQC:415"}}]}},{"Replacement":{"inode":{"change":13,"pos":436},"path":"src/lib/Hydra/Helper/Nix.pm","line":19,"ins":{"up_context":[{"change":5,"pos":862}],"down_context":[{"change":5,"pos":77}],"flag":"BLOCK","start":392,"end":419,"inode":{"change":13,"pos":436}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":862},"to":{"change":5,"start":862,"end":877},"introduced_by":5}],"inode":{"change":13,"pos":436}},"ins_contents":[{"Add":{"text":" getEvals getMachines);","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:418"}}],"del_contents":[{"Del":{"text":" getEvals);","pos":"VH5ZABDRP565VZIG55YHNYYPST53NQ2J6YM362NSLXCAHI5WPH4AC:876"}}]}},{"Edit":{"inode":{"change":13,"pos":436},"path":"src/lib/Hydra/Helper/Nix.pm","line":374,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":2639}],"down_context":[{"change":5,"pos":9702}],"flag":"BLOCK","start":420,"end":1399,"inode":{"change":13,"pos":436}}},"contents":[{"Add":{"text":"}","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:421"}},{"Add":{"text":"","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:422"}},{"Add":{"text":"sub getMachines {","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:440"}},{"Add":{"text":" my $machinesConf = $ENV{\"NIX_REMOTE_SYSTEMS\"} || \"/etc/nix.machines\";","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:514"}},{"Add":{"text":"","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:515"}},{"Add":{"text":" # Read the list of machines.","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:548"}},{"Add":{"text":" my %machines = ();","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:571"}},{"Add":{"text":" if (-e $machinesConf) {","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:599"}},{"Add":{"text":" open CONF, \"<$machinesConf\" or die;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:643"}},{"Add":{"text":" while () {","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:668"}},{"Add":{"text":" chomp;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:687"}},{"Add":{"text":" s/\\#.*$//g;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:711"}},{"Add":{"text":" next if /^\\s*$/;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:740"}},{"Add":{"text":" my @tokens = split /\\s/, $_;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:781"}},{"Add":{"text":" my @supportedFeatures = split(/,/, $tokens[5] || \"\");","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:847"}},{"Add":{"text":" my @mandatoryFeatures = split(/,/, $tokens[6] || \"\");","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:913"}},{"Add":{"text":" $machines{$tokens[0]} =","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:949"}},{"Add":{"text":" { systemTypes => [ split(/,/, $tokens[1]) ]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1009"}},{"Add":{"text":" , sshKeys => $tokens[2]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1049"}},{"Add":{"text":" , maxJobs => int($tokens[3])","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1094"}},{"Add":{"text":" , speedFactor => 1.0 * (defined $tokens[4] ? int($tokens[4]) : 1)","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1176"}},{"Add":{"text":" , supportedFeatures => [ @supportedFeatures, @mandatoryFeatures ]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1258"}},{"Add":{"text":" , mandatoryFeatures => [ @mandatoryFeatures ]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1320"}},{"Add":{"text":" };","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1339"}},{"Add":{"text":" }","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1349"}},{"Add":{"text":" close CONF;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1369"}},{"Add":{"text":" }","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1375"}},{"Add":{"text":" return \\%machines;","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1398"}}]}},{"Replacement":{"inode":{"change":14,"pos":8348},"path":"src/root/machine-status.tt","line":9,"ins":{"up_context":[{"change":3,"pos":259}],"down_context":[{"change":3,"pos":416}],"flag":"BLOCK","start":1400,"end":1459,"inode":{"change":14,"pos":8348}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":259},"to":{"change":3,"start":259,"end":416},"introduced_by":3}],"inode":{"change":14,"pos":8348}},"ins_contents":[{"Add":{"text":" [% IF m.value.maxJobs > 0 %]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1438"}},{"Add":{"text":" Running","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1458"}}],"del_contents":[{"Del":{"text":" [% IF m.enabled == 1 %]","pos":"V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC:292"}},{"Del":{"text":" Running","pos":"V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC:415"}}]}},{"Replacement":{"inode":{"change":14,"pos":8348},"path":"src/root/machine-status.tt","line":12,"ins":{"up_context":[{"change":3,"pos":437}],"down_context":[{"change":3,"pos":729}],"flag":"BLOCK","start":1460,"end":1641,"inode":{"change":14,"pos":8348}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":437},"to":{"change":3,"start":437,"end":729},"introduced_by":3}],"inode":{"change":14,"pos":8348}},"ins_contents":[{"Add":{"text":" Stopped","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1479"}},{"Add":{"text":" [% END %] [% m.key %] ([% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END; system; END %])","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1640"}}],"del_contents":[{"Del":{"text":" Stopped","pos":"V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC:557"}},{"Del":{"text":" [% END %] [% m.hostname %] ([% comma=0; FOREACH ms IN m.buildmachinesystemtypes %][% IF comma; %], [% ELSE; comma = 1; END; ms.system; END %])","pos":"V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC:728"}}]}},{"Replacement":{"inode":{"change":14,"pos":8348},"path":"src/root/machine-status.tt","line":20,"ins":{"up_context":[{"change":3,"pos":811}],"down_context":[{"change":3,"pos":812}],"flag":"BLOCK","start":1642,"end":1698,"inode":{"change":14,"pos":8348}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":811},"to":{"change":5,"start":10117,"end":10178},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10117},"to":{"change":5,"start":10117,"end":10178},"introduced_by":5}],"inode":{"change":14,"pos":8348}},"ins_contents":[{"Add":{"text":" [% IF step.machine.match('@(.*)').0 == m.key %]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1697"}}],"del_contents":[{"Del":{"text":" [% IF step.machine.match('@(.*)').0 == m.hostname %]","pos":"SMCOU72FKTPFNCDXFJAILVUWFE4DY33CJJE4436H5POKENFFDFFAC:10177"}}]}},{"Replacement":{"inode":{"change":14,"pos":8348},"path":"src/root/machine-status.tt","line":32,"ins":{"up_context":[{"change":3,"pos":1374}],"down_context":[{"change":3,"pos":1496}],"flag":"BLOCK","start":1699,"end":1933,"inode":{"change":14,"pos":8348}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1374},"to":{"change":3,"start":1374,"end":1496},"introduced_by":3}],"inode":{"change":14,"pos":8348}},"ins_contents":[{"Add":{"text":" [% IF m.value.idle %] ","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1729"}},{"Add":{"text":" Idle since [% INCLUDE renderDuration duration = curTime - m.value.idle %]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1843"}},{"Add":{"text":" [% ELSE %]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1862"}},{"Add":{"text":" Never built","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1914"}},{"Add":{"text":" [% END %]","pos":"HTL6HIBMRGSX2H2H7KB4MC3H6UQ5C752VC3UHC43SRA7V66PQCRQC:1932"}}],"del_contents":[{"Del":{"text":" Idle since [% INCLUDE renderDuration duration = curTime - m.get_column('idle') %]","pos":"V6S6OYIAW3ZCBP6UHUYAZGG4P237WBB6HDG5NQIF3E5YFDTQRA4AC:1495"}}]}}],"owner":"grahamc","repo":"hydra","token":"4q487onJ6MnYG3GeTFNIEKCOhlIhIft11/778vnbfz0=","login":null}

…

Dependencies

Change contents

Review