135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unecessary scrub subroutine

Browse Source
This commit is contained in:
Oliver Gorwits
2014-05-17 20:42:19 +01:00
parent 8077e3de9d
commit 5316058ba8
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Netdisco/lib/App/Netdisco/Daemon/LocalQueue.pm
View File

@@ -5,7 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use base 'Exporter'; use base 'Exporter';
our @EXPORT = (); our @EXPORT = ();
our @EXPORT_OK = qw/ add_jobs capacity_for take_jobs reset_jobs scrub_jobs /; our @EXPORT_OK = qw/ add_jobs capacity_for take_jobs reset_jobs/;
our %EXPORT_TAGS = ( all => \@EXPORT_OK ); our %EXPORT_TAGS = ( all => \@EXPORT_OK );
schema('daemon')->deploy; schema('daemon')->deploy;
@@ -28,10 +28,11 @@ sub capacity_for {
sub take_jobs { sub take_jobs {
my ($wid, $type, $max) = @_; my ($wid, $type, $max) = @_;
return () unless $wid > 1;
$max ||= 1; $max ||= 1;
# asking for more jobs means the current ones are done debug "deleting completed jobs by worker $wid";
scrub_jobs($wid); $queue->search({wid => $wid})->delete;
debug "searching for $max new jobs for worker $wid (type $type)"; debug "searching for $max new jobs for worker $wid (type $type)";
my $rs = $queue->search( my $rs = $queue->search(
@@ -49,6 +50,7 @@ sub take_jobs {
return \@rows; return \@rows;
} }
# not used by workers, only the daemon when reinitializing a worker
sub reset_jobs { sub reset_jobs {
my ($wid) = @_; my ($wid) = @_;
debug "resetting jobs owned by worker $wid to be available"; debug "resetting jobs owned by worker $wid to be available";
@@ -57,11 +59,4 @@ sub reset_jobs {
->update({wid => 0}); ->update({wid => 0});
} }
sub scrub_jobs {
my ($wid) = @_;
debug "deleting dangling jobs owned by worker $wid";
return unless $wid > 1;
$queue->search({wid => $wid})->delete;
}
1; 1;