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

bug fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-26 22:57:06 +00:00
parent 48f779a8d0
commit cfcb7a956f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/bin/netdisco-daemon-fg
View File

@@ -46,7 +46,7 @@ sub build_tasks_list {
user_begin => worker_factory('Manager'), user_begin => worker_factory('Manager'),
}]; }];
$has_scheduler = (setting('housekeeping') ? 1 : 0); my $has_scheduler = (setting('housekeeping') ? 1 : 0);
push @$tasks, { push @$tasks, {
max_workers => 1, max_workers => 1,
user_begin => worker_factory('Scheduler'), user_begin => worker_factory('Scheduler'),
@@ -70,7 +70,7 @@ sub build_tasks_list {
} if setting('daemon_interactives'); } if setting('daemon_interactives');
info sprintf "MCE will load %s tasks: 1 Manager, %s Scheduler, %s Poller, %s Interactive", info sprintf "MCE will load %s tasks: 1 Manager, %s Scheduler, %s Poller, %s Interactive",
(1+ scalar @$tasks), $has_scheduler, (scalar @$tasks), $has_scheduler,
(setting('daemon_pollers') || 0), (setting('daemon_pollers') || 0),
(setting('daemon_interactives') || 0); (setting('daemon_interactives') || 0);
return $tasks; return $tasks;

3
Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
View File

@@ -42,7 +42,8 @@ sub worker_begin {
sub worker_body { sub worker_body {
my $self = shift; my $self = shift;
my $wid = $self->wid; my $wid = $self->wid;
my $num_slots = $self->do('num_workers'); my $num_slots = $self->do('num_workers')
or return warning "mgr ($wid): this node has no workers... quitting manager";
# get some pending jobs # get some pending jobs
my $rs = schema('netdisco')->resultset('Admin') my $rs = schema('netdisco')->resultset('Admin')