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

tear down the ssh master session only after killing all node sessions

Browse Source 
this solves the problem of ports being marked "built" after the node
building it was lost
This commit is contained in:
sturm 2005-01-30 10:07:36 +00:00
parent d0b3bb1e3d
commit 182d8ff4d8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/build/dpb
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl -w
# $OpenBSD: dpb,v 1.10 2004/12/26 07:48:46 sturm Exp $
# $OpenBSD: dpb,v 1.11 2005/01/30 10:07:36 sturm Exp $
# Copyright (c) 2004 Nikolay Sturm <sturm@openbsd.org>.
#
# Redistribution and use in source and binary forms, with or without
@ -154,7 +154,6 @@ sub mark_host_down($)
warn "*** lost $host\n";
$HOSTS->{$host}{down} = 1;
kill_ssh_master($host);
push(@DOWN_HOSTS, $host);
foreach my $node (@{$HOSTS->{$host}{nodes}}) {
@ -167,6 +166,8 @@ sub mark_host_down($)
}
mark_node_down($node);
}
kill_ssh_master($host);
}
sub mark_node_down($)
@ -326,7 +327,7 @@ sub update_after_slave($)
remove_port($port);
} elsif ($retval == 255) {
warn "*** $node died on signal, retrying $port later.\n";
warn "*** $node died with signal, retrying $port later.\n";
} else {
warn "*** Unexpected return code $retval from $node "
. "for $port.\n";