-# $Id: IRSpy.pm,v 1.75 2007-03-09 08:56:37 mike Exp $
+# $Id: IRSpy.pm,v 1.80 2007-03-30 09:50:55 mike Exp $
package ZOOM::IRSpy;
use ZOOM::IRSpy::Node;
use ZOOM::IRSpy::Connection;
use ZOOM::IRSpy::Stats;
-use ZOOM::IRSpy::Utils qw(cql_target render_record);
+use ZOOM::IRSpy::Utils qw(cql_target render_record irspy_xpath_context);
our @ISA = qw();
our $VERSION = '0.02';
# 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.
- $conn->connect($conn->option("host"));
+ $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");
$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 => "<dummy/>"); # Work around Zebra bug
+ $p->send("update");
+ $p->destroy();
+ }
+
$p = $conn->package();
$p->send("commit");
$p->destroy();
$conn->log("irspy", "has no more tests: removing");
$this->_rewrite_record($conn);
$conn->option(rewrote_record => 1);
- $conn->destroy();
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);
}
$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);