X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=736585c69ff5e92f226e5c8355c9c67877430941;hp=a8ba5560273dc3e2dd57010975fd810e8781b763;hb=0e124b9481a9b50b4d2110bdb264d31e0b35663f;hpb=70d8943f414865746494f471cb3db81c85a65799 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index a8ba556..736585c 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.67 2007-02-23 15:01:48 mike Exp $ +# $Id: IRSpy.pm,v 1.81 2007-04-18 15:23:41 mike Exp $ package ZOOM::IRSpy; @@ -15,9 +15,8 @@ use ZOOM; use Net::Z3950::ZOOM 1.13; # For the ZOOM version-check only use ZOOM::IRSpy::Node; use ZOOM::IRSpy::Connection; -use ZOOM::IRSpy::Record; use ZOOM::IRSpy::Stats; -use ZOOM::IRSpy::Utils qw(cql_target); +use ZOOM::IRSpy::Utils qw(cql_target render_record irspy_xpath_context); our @ISA = qw(); our $VERSION = '0.02'; @@ -65,7 +64,7 @@ BEGIN { sub new { my $class = shift(); - my($dbname, $user, $password) = @_; + my($dbname, $user, $password, $activeSetSize) = @_; my @options; push @options, (user => $user, password => $password) @@ -85,13 +84,17 @@ sub new { my $this = bless { conn => $conn, - allrecords => 1, # unless overridden by targets() - query => undef, # filled in later - targets => undef, # filled in later - connections => undef, # filled in later + query => "cql.allRecords=1", # unless overridden + targets => undef, # Filled in later if targets() is + # called; used only to keep state from + # targets() until initialise() is + # called. + connections => undef, # Filled in by initialise() + queue => undef, # Filled in by initialise() libxml => $libxml, irspy_to_zeerex_style => $irspy_to_zeerex_style, - tests => [], # stack of tests currently being executed + tests => undef, # Tree of tests to be executed + activeSetSize => defined $activeSetSize ? $activeSetSize : 10, }, $class; $this->log("irspy", "starting up with database '$dbname'"); @@ -105,6 +108,14 @@ sub log { } +sub find_targets { + my $this = shift(); + my($query) = @_; + + $this->{query} = $query; +} + + # Explicitly nominate a set of targets to check, overriding the # default which is to re-check everything in the database. Each # target already in the database results in the existing record being @@ -116,7 +127,6 @@ sub targets { $this->log("irspy", "setting explicit list of targets ", join(", ", map { "'$_'" } @targets)); - $this->{allrecords} = 0; my @qlist; foreach my $target (@targets) { my($host, $port, $db, $newtarget) = _parse_target_string($target); @@ -149,99 +159,42 @@ sub _parse_target_string { } -# There are two cases. -# -# 1. A specific set of targets is nominated on the command line. -# - Records must be fetched for those targets that are in the DB -# - New, empty records must be made for those that are not. -# - Updated records written to the DB may or may not be new. -# -# 2. All records in the database are to be checked. -# - Records must be fetched for all targets in the DB -# - Updated records written to the DB may not be new. -# -# That's all -- what could be simpler? +# Records must be fetched for all records satisfying $this->{query} If +# $this->{targets} is already set (i.e. a specific list of targets to +# check was specified by a call to targets()), then new, empty records +# will be made for any targets that are not already in the database. # sub initialise { my $this = shift(); - my %target2record; - if ($this->{allrecords}) { - # We need to check on every target in the database, which - # means we need to do a "find all". According to the BIB-1 - # semantics document at - # http://www.loc.gov/z3950/agency/bib1.html - # the query - # @attr 2=103 @attr 1=1035 x - # should find all records, but it seems that Zebra doesn't - # support this. Furthermore, when using the "alvis" filter - # (as we do for IRSpy) it doesn't support the use of any BIB-1 - # access point -- not even 1035 "everywhere" -- so instead we - # hack together a search that we know will find all records. - $this->{query} = "port=?*"; + my @targets; + my $targets = $this->{targets}; + if (defined $targets) { + @targets = @$targets; + delete $this->{targets}; } else { - # Prepopulate the target map with nulls so that after we fill - # in what we can from the database query, we know which target - # IDs we need new records for. - foreach my $target (@{ $this->{targets} }) { - $target2record{lc($target)} = undef; - } - } - - $this->log("irspy_debug", "query '", $this->{query}, "'"); - my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query})); - delete $this->{query}; # No longer needed at all - $this->log("irspy_debug", "found ", $rs->size(), " target records"); - foreach my $i (1 .. $rs->size()) { - my $target = _render_record($rs, $i-1, "id"); - my $zeerex = _render_record($rs, $i-1, "zeerex"); - #print STDERR "making '$target' record with '$zeerex'\n"; - $target2record{lc($target)} = - new ZOOM::IRSpy::Record($this, $target, $zeerex); - push @{ $this->{targets} }, $target - if $this->{allrecords}; - } + my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query})); + $this->log("irspy", "'", $this->{query}, "' found ", + $rs->size(), " target records"); + delete $this->{query}; - # Make records for targets not previously in the database - foreach my $target (keys %target2record) { - my $record = $target2record{$target}; - if (!defined $record) { - $this->log("irspy_debug", "made new record for '$target'"); - $target2record{$target} = new ZOOM::IRSpy::Record($this, $target); - } else { - $this->log("irspy_debug", "using existing record for '$target'"); + foreach my $i (1 .. $rs->size()) { + push @targets, render_record($rs, $i-1, "id"); } } + my $n = $this->{activeSetSize}; + $n = @targets if $n == 0 || $n > @targets; + my @connections; - foreach my $target (@{ $this->{targets} }) { - my $conn = create ZOOM::IRSpy::Connection($this, async => 1); - $conn->option(host => $target); - my $record = delete $target2record{lc($target)}; - $conn->record($record); - push @connections, $conn; + foreach my $i (1..$n) { + push @connections, create ZOOM::IRSpy::Connection($this, + shift @targets, + async => 1); } - die("remaining target2record = { " . - join(", ", map { "$_ ->'" . $target2record{$_}. "'" } - sort keys %target2record) . " }") - if %target2record; $this->{connections} = \@connections; - delete $this->{targets}; # The information is now in {connections} -} - - -sub _render_record { - my($rs, $which, $elementSetName) = @_; - - # There is a slight race condition here on the element-set name, - # but it shouldn't be a problem as this is (currently) only called - # from parts of the program that run single-threaded. - my $old = $rs->option(elementSetName => $elementSetName); - my $rec = $rs->record($which); - $rs->option(elementSetName => $old); - - return $rec->render(); + $this->{queue} = \@targets; } @@ -252,7 +205,8 @@ sub _irspy_to_zeerex { if ($save_xml) { unlink('/tmp/irspy_orig.xml'); - open FH, '>/tmp/irspy_orig.xml'; + open FH, '>/tmp/irspy_orig.xml' + or die "can't write irspy_orig.xml: $!"; print FH $irspy_doc->toString(); close FH; } @@ -260,7 +214,8 @@ sub _irspy_to_zeerex { my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params); if ($save_xml) { unlink('/tmp/irspy_transformed.xml'); - open FH, '>/tmp/irspy_transformed.xml'; + open FH, '>/tmp/irspy_transformed.xml' + or die "can't write irspy_transformed.xml: $!"; print FH $result->toString(); close FH; } @@ -275,12 +230,19 @@ sub _rewrite_record { $conn->log("irspy", "rewriting XML record"); my $rec = $this->_irspy_to_zeerex($conn, $ENV{IRSPY_SAVE_XML}); + + # Since IRSpy can run for a long time between writes back to the + # database, it's quite possible for the server to have closed the + # connection as idle. So re-establish it if necessary. + $this->{conn}->connect($conn->option("host")); + _really_rewrite_record($this->{conn}, $rec); + $conn->log("irspy", "rewrote XML record"); } sub _really_rewrite_record { - my($conn, $rec) = @_; + my($conn, $rec, $oldid) = @_; my $p = $conn->package(); $p->option(action => "specialUpdate"); @@ -289,6 +251,23 @@ sub _really_rewrite_record { $p->send("update"); $p->destroy(); + # This is the expression in the ID-making stylesheet + # ../../zebra/zeerex2id.xsl + my $xc = irspy_xpath_context($rec); + my $id = $xc->find("concat(e:serverInfo/e:host, ':', + e:serverInfo/e:port, '/', + e:serverInfo/e:database)"); + if (defined $oldid && $id ne $oldid) { + # Delete old record; + warn "IDs differ (old='$oldid' new='$id')"; + my $p = $conn->package(); + $p->option(action => "recordDelete"); + $p->option(recordIdOpaque => $oldid); + $p->option(record => ""); # Work around Zebra bug + $p->send("update"); + $p->destroy(); + } + $p = $conn->package(); $p->send("commit"); $p->destroy(); @@ -336,9 +315,14 @@ sub check { $tname = "Main" if !defined $tname; $this->{tree} = $this->_gather_tests($tname) or die "No tests defined for '$tname'"; + $this->{tree}->resolve(); #$this->{tree}->print(0); - my $nskipped = 0; + my $topname = $this->{tree}->name(); + my $timeout = "ZOOM::IRSpy::Test::$topname"->timeout(); + $this->log("irspy", "beginnning with test '$topname' (timeout $timeout)"); + + my $nskipped = 0; my @conn = @{ $this->{connections} }; my $nruns = 0; @@ -349,6 +333,7 @@ sub check { foreach my $i0 (0 .. $#copy_conn) { my $conn = $copy_conn[$i0]; #print "connection $i0 of $nconn/", scalar(@conn), " is $conn\n"; + next if !defined $conn; if (!$conn->current_task()) { if (!$conn->next_task()) { # Out of tasks: we need a new test @@ -358,16 +343,28 @@ sub check { if (!defined $address) { $nextaddr = ""; } else { - $this->log("irspy_test", + $conn->log("irspy_test", "checking for next test after '$address'"); $nextaddr = $this->_next_test($address); } if (!defined $nextaddr) { $conn->log("irspy", "has no more tests: removing"); - ### Does this go wrong if two connections are exhausted? - splice @conn, $i0, 1; $this->_rewrite_record($conn); $conn->option(rewrote_record => 1); + if (@{ $this->{queue} } == 0) { + # Do not destroy: we need this for later sanity checks + splice @conn, $i0, 1; + } else { + $conn->destroy(); + $conn[$i0] = create + ZOOM::IRSpy::Connection($this, + shift @{ $this->{queue} }, async => 1, + timeout => $timeout); + $conn[$i0]->option(current_test_address => ""); + $conn[$i0]->log("irspy", "entering active pool - ", + scalar(@{ $this->{queue} }), + " targets remain in queue"); + } next; } @@ -427,11 +424,13 @@ sub check { die "$conn has no current task for event $ev ($evstr)" if !$task; my $res; - eval { $conn->_check() }; - if ($@) { + eval { $conn->check() }; + if ($@ && ref $@ && $@->isa("ZOOM::Exception")) { my $sub = $task->{cb}->{exception}; die $@ if !defined $sub; $res = &$sub($conn, $task, $task->udata(), $@); + } elsif ($@) { + die "Unexpected non-ZOOM exception: " . ref($@) . " ($@)"; } else { my $sub = $task->{cb}->{$ev}; if (!defined $sub) { @@ -462,12 +461,22 @@ sub check { $conn->next_task(0); if ($res == ZOOM::IRSpy::Status::TEST_BAD) { my $address = $conn->option('current_test_address'); - ($address, my $n) = $this->_last_sibling_test($address); - if (defined $address) { - $conn->log("irspy_test", "skipped $n tests"); - $conn->option(current_test_address => $address); - $nskipped += $n; + $conn->log("irspy", "top-level test failed!") + if $address eq ""; + my $node = $this->{tree}->select($address); + my $skipcount = 0; + while (defined $node->next() && + length($node->next()->address()) >= length($address)) { + $conn->log("irspy_debug", "skipping from '", + $node->address(), "' to '", + $node->next()->address(), "'"); + $node = $node->next(); + $skipcount++; } + + $conn->option(current_test_address => $node->address()); + $conn->log("irspy_test", "skipped $skipcount tests"); + $nskipped += $skipcount; } } elsif ($res == ZOOM::IRSpy::Status::TEST_SKIPPED) { @@ -482,9 +491,10 @@ sub check { } $this->log("irspy", "exiting main loop"); + # Sanity checks: none of the following should ever happen my $finished = 1; - @conn = @{ $this->{connections} }; + $this->log("irspy", "performing end-of-run sanity-checks"); foreach my $conn (@conn) { my $test = $conn->option("current_test_address"); my $next = $this->_next_test($test); @@ -544,6 +554,29 @@ sub check { } +# Exactly equivalent to ZOOM::event() except that it is tolerant to +# undefined values in the array being passed in. +# +sub __UNUSED_tolerant_ZOOM_event { + my($connref) = @_; + + my(@conn, @map); + foreach my $i (0 .. @$connref-1) { + my $conn = $connref->[$i]; + if (defined $conn) { + push @conn, $conn; + push @map, $i; + } + } + + my $res = ZOOM::event(\@conn); + return $res if $res <= 0; + my $res2 = $map[$res-1] + 1; + print STDERR "*** tolerant_ZOOM_event() returns $res->$res2\n"; + return $res2; +} + + sub _gather_tests { my $this = shift(); my($tname, @ancestors) = @_;