cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't mix up wait_timeout and waiting_timeout, as noticed by naddy@.

Browse Source 
re-enable wait_timeout on localhost temporarily (should be done in another
way, most probably by checking whether repo is on nfs, we can steal code
from VStat.pm)

pass umask through ssh. This took us long enough to figure out, and it's
considerably simpler than tweaking every login class once again.
This commit is contained in:
espie 2012-11-06 08:26:29 +00:00
parent bb4abf1a74
commit d73a931704
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.59 2012/10/13 09:00:02 espie Exp $
# $OpenBSD: dpb,v 1.60 2012/11/06 08:26:29 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -263,7 +263,7 @@ sub start_cores
my $default_prop = {
junk => 250,
parallel => '/2',
waiting_timeout => 600,
wait_timeout => 600,
};
if ($state->{config}) {

9
infrastructure/lib/DPB/Core.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Core.pm,v 1.19 2012/10/13 09:06:55 espie Exp $
# $OpenBSD: Core.pm,v 1.20 2012/11/06 08:26:29 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -27,12 +27,13 @@ sub new
my ($class, $name, $prop) = @_;
$prop //= {};
$prop->{sf} //= 1;
$prop->{umask} //= sprintf("0%o", umask);
if (defined $prop->{stuck}) {
$prop->{stuck_timeout} = $prop->{stuck} * $prop->{sf};
}
if ($class->name_is_localhost($name)) {
delete $prop->{waiting_timeout};
}
# if ($class->name_is_localhost($name)) {
# delete $prop->{wait_timeout};
# }
$hosts->{$name} //= bless {host => $name, prop => $prop }, $class;
}

5
infrastructure/lib/DPB/Core/Distant.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Distant.pm,v 1.6 2012/10/13 08:47:32 espie Exp $
# $OpenBSD: Distant.pm,v 1.7 2012/11/06 08:26:29 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -84,7 +84,8 @@ sub exec
if ($self->{dir}) {
$cmd = "cd $self->{dir} && $cmd";
}
$self->_run($cmd);
my $umask = $self->{master}{host}{prop}{umask};
$self->_run("umask $umask && $cmd");
}
package DPB::Task::SshMaster;

8
infrastructure/man/man1/dpb.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: dpb.1,v 1.48 2012/10/27 11:17:56 espie Exp $
.\" $OpenBSD: dpb.1,v 1.49 2012/11/06 08:26:29 espie Exp $
.\"
.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: October 27 2012 $
.Dd $Mdocdate: November 6 2012 $
.Dt DPB 1
.Os
.Sh NAME
@ -205,11 +205,11 @@ This can be instead set on a per-core basis as the
.Sq stuck
property.
Note that this will always be divided by the core's speed factor.
.It Ar WAITING_TIMEOUT
.It Ar WAIT_TIMEOUT
Timeout (in seconds) to wait before giving up on NFS packages showing up.
Set to 0 to disable.
Defaults to 10 minutes.
Disabled on localhost.
.\" Disabled on localhost.
.El
.It Fl e
The listing job is extra and won't be given back to the pool when it's