X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=5ad23aba45cee579194db88de85a862b9af587a2;hp=4ee367bd4566089f938ff436d9b7b9683595c28c;hb=6de06472ab43534bd889e531ae060bbd4c935518;hpb=28ba04005c9ac95f4539257a95d23eeef9705206

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 4ee367bd4..5ad23aba4 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -1,15 +1,19 @@
 #!/usr/bin/perl -w
 
 use strict;
+use POSIX qw( :sys_wait_h );
 use Sys::SigAction qw( set_sig_handler );
 use Date::Parse;
 use Date::Format;
+use IPC::Run qw( run ); #timeout );
 use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
-use FS::UID qw( adminsuidsetup dbh driver_name );
-use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
+use FS::UID qw( adminsuidsetup forksuidsetup dbh driver_name );
+use FS::Record qw( qsearch );
 use FS::torrus_srvderive;
 
 our $DEBUG = 2;
+our $max_kids = 4;
+our %kids;
 
 my $user = shift or die &usage;
 $FS::Daemon::PID_NEWSTYLE = 1;
@@ -30,164 +34,128 @@ die "not running: network_monitoring_system not Torrus_Internal\n"
 
 #--
 
-my $str2time = str2time_sql();
-my $c = str2time_sql_closing();
+our $kids = 0;
 
-my $_date = concat_sql([ 'srvexport.srv_date', "' '", 'srvexport.srv_time' ]);
-$_date = "CAST( $_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
-$_date = str2time_sql. $_date.  str2time_sql_closing;
+#MAIN: while (1) {
+while (1) {
 
-my $other_date = concat_sql([ 'other.srv_date', "' '", 'other.srv_time' ]);
-$other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
-$other_date = str2time_sql. $other_date.  str2time_sql_closing;
+  #SERVICEID: foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
+  foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
 
-my $in  = concat_sql([ '?', "'_IN'" ]);
-my $out = concat_sql([ '?', "'_OUT'" ]);
+    &reap_kids;
+    if ( $kids >= $max_kids ) {
+      sleep 5;
+      myexit() if sigterm() || sigint();
+      redo;
+    }
 
-my $sql = "
-  SELECT DISTINCT srv_date, srv_time FROM srvexport
-    WHERE NOT EXISTS (
-                       SELECT 1 FROM srvexport AS other
-                         WHERE other.serviceid IN ( $in, $out )
-                           AND srvexport.srv_date = other.srv_date
-                           AND ABS( $_date - $other_date ) <= 60
-                     )
-";
+    defined( my $pid = fork ) or do {
+      #warn "WARNING: can't fork: $!\n";
+      #next; #don't increment the kid counter
+      die "can't fork: $!\n";
+    };
 
-my $orderlimit = "
-    ORDER BY srv_date, srv_time
-    LIMIT 50
-";
+    if ( $pid ) {
+      $kids++;
+      $kids{$pid} = 1;
+    } else { #kid time
 
+      #get new db handle
+      $FS::UID::dbh->{InactiveDestroy} = 1;
 
-MAIN: while (1) {
+      forksuidsetup($user);
 
-  my $found = 0;
+      my $serviceid = $torrus_srvderive->serviceid;
 
-  foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
+      my @serviceids = $torrus_srvderive->component_serviceids;
+      exit unless @serviceids; #don't try to search for empty virtual ports
 
-    my $serviceid = $torrus_srvderive->serviceid;
+      my @in = ();
+      for my $dir ('_IN', '_OUT') {
+        push @in, map dbh->quote("$_$dir"), @serviceids;
+      }
+      my $in = join(',', @in);
+
+      if ( ! $torrus_srvderive->last_srv_date ) {
+        warn "finding initial last_srv_date for $serviceid\n" if $DEBUG;
+        my $dsql = "SELECT srv_date FROM srvexport WHERE serviceid IN ($in)
+                    ORDER BY srv_date LIMIT 1";
+        my $dsth = dbh->prepare($dsql) or die $DBI::errstr;
+        $dsth->execute or die $dsth->errstr;
+        my $row = $dsth->fetchrow_arrayref;
+        my $date = (defined($row) && ref($row)) ? $row->[0] : '';
+        if ( $date ) {
+          warn "found initial last_srv_date of $date; updating $serviceid\n"
+            if $DEBUG;
+          $torrus_srvderive->last_srv_date($date);
+          my $error = $torrus_srvderive->replace;
+          die $error if $error;
+        } else {
+          warn "no initial last_srv_date for $serviceid; skipping\n" if $DEBUG;
+          exit;
+        }
+      }
 
-    my @serviceids = $torrus_srvderive->component_serviceids;
+      #if we're more than a day behind, call native torrus srvderive
+      my $last_srv_date = $torrus_srvderive->last_srv_date;
+      my $currdate = time2str('%Y-%m-%d', time);
+      if ( $last_srv_date ne $currdate
+           && time - str2time($last_srv_date) > (24)*60*60
+         ) {
+        warn "serviceid $serviceid last_srv_date != $currdate\n" if $DEBUG;
+
+        #delete records from last_srv_date
+        my $dsql =
+          'DELETE FROM srvexport WHERE srv_date = ? AND serviceid IN(?,?)';
+        my $dsth = dbh->prepare($dsql) or die $DBI::errstr;
+        warn "$dsql $last_srv_date ${serviceid}_IN ${serviceid}_OUT\n"
+          if $DEBUG;
+        $dsth->execute($last_srv_date, $serviceid.'_IN', $serviceid.'_OUT')
+          or die $dsth->errstr;
+        dbh->commit or die dbh->errstr;
+
+        foreach my $dir ('_IN','_OUT') {
+
+          #XX TORRUS_PATH
+          my @cmd = ( '/usr/local/bin/torrus', 'srvderive',
+                        "--start=$last_srv_date", "--end=$currdate",
+                        "--out=$serviceid$dir", "--func=SUM",
+                        map "$_$dir", @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\n" if $DEBUG;
-
-    eval {
-      my $h = set_sig_handler(
-        'ALRM', sub {
-          local $SIG{__DIE__};
-          warn "search timed out\n";
-          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 "calling native srvderive: ". join(' ', @cmd). "\n" if $DEBUG;
+          my $out_and_err = '';
+          run( \@cmd, '>&', \$out_and_err ) #verbose?  timeout?
+            or die "error calling native srvderive: $out_and_err\n";
 
-    warn "search executed; checking results\n" if $DEBUG;
+        }
+        warn "native srvderive done" if $DEBUG;
 
-    my $prev = 0;
-    while ( my $row = $sth->fetchrow_arrayref ) {
-      last if sigterm() || sigint();
+        $torrus_srvderive->last_srv_date($currdate);
+        my $error = $torrus_srvderive->replace;
+        die $error if $error;
 
-      my( $srv_date, $srv_time ) = @$row;
-      my $cur = str2time( "$srv_date $srv_time" );
-      next if $cur-$prev <= 60;
-      last if time - $cur <= 300;
+        #don't bother trying today's immediately
+        warn "done with $serviceid for now\n" if $DEBUG;
 
-      warn "no $serviceid for $srv_date $srv_time; adding\n"
-        if $DEBUG;
-      $found++;
+      } else {
 
-      for my $dir ('_IN', '_OUT') {
+        warn "serviceid $serviceid last_srv_date == $currdate; skipping\n"
+          if $DEBUG;
 
-        my $sin = join(',', map dbh->quote("$_$dir"), @serviceids);
-
-        my $sum = "
-          SELECT COALESCE(SUM(value),0) FROM srvexport AS other
-            WHERE other.serviceid IN ($sin)
-              AND ABS( $cur - $other_date ) <= 60
-        ";
-
-        my $isql = "
-          INSERT INTO srvexport ( srv_date, srv_time, serviceid, value, intvl )
-            VALUES ( ?, ?, ?, ($sum), ? )
-        ";
-        my @param = ( time2str('%Y-%m-%d', $cur), #srv_date
-                      time2str('%X', $cur),       #srv_time
-                      "$serviceid$dir",
-                      300, #intvl ... 
-                    );
-        warn $isql. ' with param '. join(',',@param). "\n"
-          if $DEBUG > 2;
-
-        my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
-
-        #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;
+      exit; #end-of-kid
 
-      $prev = $cur;
     }
-    warn "done with $serviceid\n" if $DEBUG;
 
   } #foreach my $torrus_srvderive
   dbh->commit or die dbh->errstr;
 
   myexit() if sigterm() || sigint();
+  warn "sleeping an hour\n" if $DEBUG > 1;
+  sleep 60*60;
   warn "restarting main loop\n" if $DEBUG > 1;
-  sleep 60 unless $found;
 }
 
 sub _shouldrun {
@@ -199,6 +167,15 @@ sub usage {
   die "Usage:\n\n  freeside-cdrrewrited user\n";
 }
 
+sub reap_kids {
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      $kids--;
+      delete $kids{$kid};
+    }
+  }
+}
 
 =head1 NAME