#!/usr/bin/perl -w
use strict;
+use Sys::SigAction qw( set_sig_handler );
use Date::Parse;
use Date::Format;
use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
my $user = shift or die &usage;
$FS::Daemon::PID_NEWSTYLE = 1;
-daemonize1('freeside-torrus-srvderive');
+daemonize1('torrus-srvderive');
drop_root();
$other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
$other_date = str2time_sql. $other_date. str2time_sql_closing;
-my $within = "ABS( $_date - $other_date ) <= 60";
-
my $in = concat_sql([ '?', "'_IN'" ]);
my $out = concat_sql([ '?', "'_OUT'" ]);
WHERE NOT EXISTS (
SELECT 1 FROM srvexport AS other
WHERE other.serviceid IN ( $in, $out )
- AND $within
+ AND srvexport.srv_date = other.srv_date
+ AND ABS( $_date - $other_date ) <= 60
)
+";
+
+my $orderlimit = "
ORDER BY srv_date, srv_time
- LIMIT 100
+ LIMIT 50
";
-while (1) {
+
+MAIN: while (1) {
my $found = 0;
my $serviceid = $torrus_srvderive->serviceid;
- warn $sql if $DEBUG > 1;
- my $sth = dbh->prepare($sql) or die $DBI::errstr; #better recovery?
- $sth->execute($serviceid, $serviceid) or die $sth->errstr;
+ my @serviceids = $torrus_srvderive->component_serviceids;
+
+ my @in = ();
+ for my $dir ('_IN', '_OUT') {
+ push @in, map dbh->quote("$_$dir"), @serviceids;
+ }
+ my $in = join(',', @in);
+
+ my $ssql = "
+ $sql AND EXISTS (
+ SELECT 1 FROM srvexport AS other
+ WHERE other.serviceid IN ($in)
+ AND srvexport.srv_date = other.srv_date
+ AND ABS( $_date - $other_date ) <= 60
+ )
+ ";
+
+ $ssql .= " AND srv_date >= '". $torrus_srvderive->last_srv_date. "' "
+ if $torrus_srvderive->last_srv_date;
+
+ $ssql .= $orderlimit;
+
+ warn "searching for times to add $serviceid\n" if $DEBUG;
+ warn $ssql if $DEBUG > 2;
+ my $sth = dbh->prepare($ssql) or die $DBI::errstr; #better recovery here?
+
+ warn "executing search" if $DEBUG;
+
+ eval {
+ my $timeout = set_sig_handler(
+ 'ALRM', sub {
+ dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
+ if driver_name eq 'mysql';
+ die '_timeout';
+ },
+ { mask=>['ALRM'] , safe=>1 }
+ );
+ alarm(5*60); # 15*60);
+ $sth->execute($serviceid, $serviceid) or die $sth->errstr;
+ alarm(0);
+ };
+ alarm(0);
+ if ( $@ =~ /^_timeout/ ) {
+ warn "search timed out; reconnecting and restarting\n";
+ adminsuidsetup($user);
+ next MAIN;
+ } elsif ( $@ ) {
+ die $@;
+ }
+
+ warn "search executed; checking results" if $DEBUG;
+
my $prev = 0;
while ( my $row = $sth->fetchrow_arrayref ) {
- $found++;
+ last if sigterm() || sigint();
+
my( $srv_date, $srv_time ) = @$row;
my $cur = str2time( "$srv_date $srv_time" );
next if $cur-$prev <= 60;
-
+ last if time - $cur <= 300;
+
warn "no $serviceid for $srv_date $srv_time; adding\n"
if $DEBUG;
-
- my @serviceids = $torrus_srvderive->component_serviceids;
+ $found++;
for my $dir ('_IN', '_OUT') {
my $sin = join(',', map dbh->quote("$_$dir"), @serviceids);
my $sum = "
- SELECT SUM(value) FROM srvexport AS other
+ SELECT COALESCE(SUM(value),0) FROM srvexport AS other
WHERE other.serviceid IN ($sin)
- AND $within
+ AND ABS( $cur - $other_date ) <= 60
";
my $isql = "
";
my @param = ( time2str('%Y-%m-%d', $cur), #srv_date
time2str('%X', $cur), #srv_time
- $serviceid,
+ "$serviceid$dir",
300, #intvl ...
);
- warn $isql. ' with param '. @param. "\n"
- if $DEBUG;
+ warn $isql. ' with param '. join(',',@param). "\n"
+ if $DEBUG > 2;
my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
- $isth->execute( @param )i or die $isth->errstr;
+
+ #stupid mysql deadlocks all the time on insert, so we need to recover
+ unless ( $isth->execute(@param) ) {
+ warn "Error inserting data for $serviceid$dir (restarting): ".
+ $isth->errstr;
+ dbh->rollback; #or die dbh->errstr;
+ sleep 5;
+ next MAIN;
+ }
}
+ if ( $srv_date ne $torrus_srvderive->last_srv_date ) {
+ warn "updating last_srv_date of $serviceid to $srv_date\n" if $DEBUG;
+ $torrus_srvderive->last_srv_date($srv_date);
+ my $error = $torrus_srvderive->replace;
+ die $error if $error;
+ }
+ dbh->commit or die dbh->errstr;
+
$prev = $cur;
}
+ warn "done with $serviceid\n" if $DEBUG;
- }
-
+ } #foreach my $torrus_srvderive
+ dbh->commit or die dbh->errstr;
myexit() if sigterm() || sigint();
- sleep 60; # unless $found;
+ warn "restarting main loop\n" if $DEBUG > 1;
+ sleep 60 unless $found;
}
sub _shouldrun {