Stop testing a target if we got to many timeouts (>= 3). See bug #3382

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Test / Record / Fetch.pm

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index ccaaa9f..b6ff9b4 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -1,4 +1,3 @@
-# $Id: Fetch.pm,v 1.31 2009-04-21 13:42:58 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -11,6 +10,7 @@ use warnings;
 use ZOOM::IRSpy::Test;
 our @ISA = qw(ZOOM::IRSpy::Test);
 
+our $max_timeout_errors = $ZOOM::IRSpy::max_timeout_errors;
 
 # These queries 
 my @queries = (
@@ -42,6 +42,16 @@ sub completed_search {
     $conn->log("irspy_test", "Fetch test search (", $task->render_query(), ") ",
               ref $event && $event->isa("ZOOM::Exception") ?
               "failed: $event" : "found $n records (event=$event)");
+
+    # remember how often a target record hit a timeout
+    if (ref $event && $event->isa("ZOOM::Exception")) {
+       if ($event =~ /Timeout/i) {
+           $conn->record->zoom_error->{TIMEOUT}++;
+            $conn->log("irspy_test", "Increase timeout error counter to: " . 
+               $conn->record->zoom_error->{TIMEOUT});
+        }
+    }
+
     if ($n == 0) {
        $task->{rs}->destroy();
        my $qindex = $udata->{queryindex}+1;
@@ -49,10 +59,14 @@ sub completed_search {
        return ZOOM::IRSpy::Status::TEST_SKIPPED
            if !defined $q;
 
-       $conn->log("irspy_test", "Trying another search ...");
-       $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+       if ($conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors) {
+           $conn->log("irspy_test", "Got $max_timeout_errors timeouts, give up...");
+        } else {
+           $conn->log("irspy_test", "Trying another search ...");
+           $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
                                ZOOM::Event::ZEND, \&completed_search,
                                exception => \&completed_search);
+       }
        return ZOOM::IRSpy::Status::TASK_DONE;
     }