aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-05-21 20:11:39 +0100
committerPascal Terjan <pterjan@gmail.com>2016-05-21 20:11:39 +0100
commit35706be627ba72ec2d1340eac3710fb526715106 (patch)
tree12c9fe2b5e62399215e9f5ccc814fd9ebca83815
parent21e953932a1380b2746b2707ea9faef3cd1a8a2e (diff)
downloadiurt-35706be627ba72ec2d1340eac3710fb526715106.tar
iurt-35706be627ba72ec2d1340eac3710fb526715106.tar.gz
iurt-35706be627ba72ec2d1340eac3710fb526715106.tar.bz2
iurt-35706be627ba72ec2d1340eac3710fb526715106.tar.xz
iurt-35706be627ba72ec2d1340eac3710fb526715106.zip
Do not consider iurt is no longer running when failing to ssh
-rwxr-xr-xulri5
1 files changed, 3 insertions, 2 deletions
diff --git a/ulri b/ulri
index f632134..8f6ae1d 100755
--- a/ulri
+++ b/ulri
@@ -362,7 +362,8 @@ foreach my $prefix (keys %pkg_tree) {
my $proc_state;
if (!$fail) {
- chomp($proc_state = sout($remote, "ps h -o state $pid"));
+ # Need to differenciate process not running with failure to ssh
+ chomp($proc_state = sout($remote, "ps h -o state $pid || echo NOT_RUNNING"));
}
my $seconds = time()-$time;
@@ -370,7 +371,7 @@ foreach my $prefix (keys %pkg_tree) {
# Reasons for failure
my $timeout = $seconds > $config->{faildelay};
my $zombie = $proc_state eq 'Z';
- my $ended = !$proc_state;
+ my $ended = $proc_state eq 'NOT_RUNNING';
unless ($success || $later || $fail || $timeout || $zombie || $ended) {
next bot;