avoid deadlocks, RT#10574

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

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index d3ea419..a02d23e 100644 (file)
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -11,7 +11,8 @@ 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 = 6;
+our $search_timeout = 30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
 our %kids;
 
 my $user = shift or die &usage;
@@ -59,8 +60,8 @@ my $sql = "
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 50
-";
+    LIMIT 100
+"; #50?
 
 our $kids = 0;
 
@@ -75,6 +76,7 @@ while (1) {
     &reap_kids;
     if ( $kids >= $max_kids ) {
       sleep 5;
+      myexit() if sigterm() || sigint();
       redo;
     }
 
@@ -99,6 +101,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 eq 'mysql' ) {
+        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;
@@ -144,7 +152,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);
       };
@@ -163,7 +171,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 ) {
@@ -236,7 +244,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 {