recover better from mysql's deadlock stupidity, grr, RT#10574

[freeside.git] / FS / bin / freeside-torrus-srvderive

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 3a23f7c..0441c47 100644 (file)
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -8,7 +8,7 @@ use FS::UID qw( adminsuidsetup dbh driver_name );
 use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
-our $DEBUG = 3;
+our $DEBUG = 2;
 
 my $user = shift or die &usage;
 $FS::Daemon::PID_NEWSTYLE = 1;
@@ -55,7 +55,7 @@ my $sql = "
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 100
+    LIMIT 50
 ";
 
 
@@ -82,12 +82,18 @@ while (1) {
                            AND srvexport.srv_date = other.srv_date
                            AND ABS( $_date - $other_date ) <= 60
                      )
-      $orderlimit
     ";
 
-    warn $ssql if $DEBUG > 1;
+    $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?
     $sth->execute($serviceid, $serviceid) or die $sth->errstr;
+
     my $prev = 0;
     while ( my $row = $sth->fetchrow_arrayref ) {
       last if sigterm() || sigint();
@@ -124,18 +130,32 @@ while (1) {
           if $DEBUG > 2;
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
-        $isth->execute( @param )       or die $isth->errstr;
-        dbh->commit                    or die dbh->errstr;
+
+        #stupid mysql deadlocks all the time here, so we need to recover
+        $isth->execute( @param ) or do {
+          warn "Error inserting data for $serviceid$dir (restarting): ".
+               $isth->errstr;
+        }
                         
       }
 
+      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;
 
   }
-
+  dbh->commit or die dbh->errstr;
 
   myexit() if sigterm() || sigint();
+  warn "restarting main loop\n" if $DEBUG > 1;
   sleep 60 unless $found;
 }