X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=cd893b44e72d03bf10b5b1a4f36df16100968008;hb=0cf16c3542043a3892f1e8b6f2671eef9f8d381c;hp=d3ea419a81a8b409f15ccaca2ea00f4dfb2c0994;hpb=c74fcbdbf96bdfa2eb2f34f843e4dc4fbc163245;p=freeside.git

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index d3ea419a8..cd893b44e 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -5,13 +5,15 @@ 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 forksuidsetup dbh driver_name );
 use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
 our $DEBUG = 2;
-our $max_kids = 3;
+our $max_kids = 4;
+our $search_timeout = 2*60*60; #60*60; #30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
 our %kids;
 
 my $user = shift or die &usage;
@@ -59,9 +61,14 @@ my $sql = "
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 50
+    LIMIT 200
 ";
 
+if ( driver_name =~ /mysql/i ) {
+  dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+  dbh->commit or die dbh->errstr;
+}
+
 our $kids = 0;
 
 #MAIN: while (1) {
@@ -75,6 +82,7 @@ while (1) {
     &reap_kids;
     if ( $kids >= $max_kids ) {
       sleep 5;
+      myexit() if sigterm() || sigint();
       redo;
     }
 
@@ -99,6 +107,12 @@ while (1) {
       my @serviceids = $torrus_srvderive->component_serviceids;
       exit unless @serviceids; #don't try to search for empty virtual ports
 
+      #nonlocking select statements; rows in this table never change
+      if ( driver_name =~ /mysql/i ) {
+        dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+        dbh->commit or die dbh->errstr;
+      }
+
       my @in = ();
       for my $dir ('_IN', '_OUT') {
         push @in, map dbh->quote("$_$dir"), @serviceids;
@@ -124,6 +138,52 @@ while (1) {
         }
       }
 
+      #alternate (hopefully more efficient) path: 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+6)*60*60 #6 hour window for
+         ) {                                                 #yesterday
+        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
+                    );
+
+          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 srvder: $out_and_err\n";
+
+        }
+        warn "native srvderive done" if $DEBUG;
+
+        $torrus_srvderive->last_srv_date($currdate);
+        my $error = $torrus_srvderive->replace;
+        die $error if $error;
+
+        #don't bother trying today's immediately
+        warn "done with $serviceid for now\n" if $DEBUG;
+        exit; #end-of-kid
+
+      }
+
       my $ssql = "
         $sql AND EXISTS (
                          SELECT 1 FROM srvexport AS other
@@ -144,7 +204,7 @@ while (1) {
 
       eval {
         my $h = set_sig_handler( 'ALRM', sub { die "_timeout\n"; } );
-        alarm(15*60); #5*60); #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
+        alarm($search_timeout);
         $sth->execute($serviceid, $serviceid) or die $sth->errstr;
         alarm(0);
       };
@@ -154,7 +214,7 @@ while (1) {
         #warn "search timed out; reconnecting and restarting\n";
         warn "search timed out\n";
         dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
-          if driver_name eq 'mysql';
+          if driver_name =~ /mysql/i;
         dbh->rollback; #or die dbh->errstr;
         #adminsuidsetup($user);
         #next SERVICEID; #MAIN;
@@ -163,7 +223,7 @@ while (1) {
         die $@;
       }
 
-      warn "search finished; checking results\n" if $DEBUG;
+      warn "search for $serviceid finished; checking results\n" if $DEBUG;
 
       my $prev = 0;
       while ( my $row = $sth->fetchrow_arrayref ) {
@@ -182,20 +242,27 @@ while (1) {
 
           my $sin = join(',', map dbh->quote("$_$dir"), @serviceids);
 
+          my $srv_date = time2str('%Y-%m-%d', $cur);
+
           my $sum = "
             SELECT COALESCE(SUM(value),0) FROM srvexport AS other
               WHERE other.serviceid IN ($sin)
+                AND other.srv_date = '$srv_date'
                 AND ABS( $cur - $other_date ) <= 60
           ";
+          my $ssth = dbh->prepare($sum) or die $DBI::errstr;
+          $ssth->execute or die $ssth->errstr; #better recovery?
+          my $value = $ssth->fetchrow_arrayref->[0];
 
           my $isql = "
-            INSERT INTO srvexport ( srv_date, srv_time, serviceid, value, intvl )
-              VALUES ( ?, ?, ?, ($sum), ? )
+            INSERT INTO srvexport (srv_date, srv_time, serviceid, value, intvl)
+              VALUES ( ?, ?, ?, ?, ? )
           ";
-          my @param = ( time2str('%Y-%m-%d', $cur), #srv_date
-                        time2str('%X', $cur),       #srv_time
-                        "$serviceid$dir",
-                        300, #intvl ... 
+          my @param = ( $srv_date,
+                        time2str('%X', $cur), #srv_time
+                        "$serviceid$dir",     #serviceid
+                        $value,
+                        300,                  #intvl ... 
                       );
           warn $isql. ' with param '. join(',',@param). "\n"
             if $DEBUG > 2;
@@ -236,7 +303,7 @@ while (1) {
 
   myexit() if sigterm() || sigint();
   warn "restarting main loop\n" if $DEBUG > 1;
-  sleep 60 unless $found;
+  #sleep 60 unless $found;
 }
 
 sub _shouldrun {