[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.36, 1.37
Ivan,,,
ivan at wavetail.420.am
Fri Apr 8 07:53:18 PDT 2011
Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv3843/FS/bin
Modified Files:
freeside-torrus-srvderive
Log Message:
continue attempting to handle mysql hanging on queries, RT#10574
Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -d -r1.36 -r1.37
--- freeside-torrus-srvderive 8 Apr 2011 01:36:56 -0000 1.36
+++ freeside-torrus-srvderive 8 Apr 2011 14:53:15 -0000 1.37
@@ -76,6 +76,25 @@
}
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 $date = $dsth->fetchrow_arrayref->[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;
+ next;
+ }
+ }
+
my $ssql = "
$sql AND EXISTS (
SELECT 1 FROM srvexport AS other
@@ -98,7 +117,7 @@
eval {
my $h = set_sig_handler( 'ALRM', sub { die "_timeout\n"; } );
- alarm(5*60); # 15*60);
+ alarm(5*60); #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
$sth->execute($serviceid, $serviceid) or die $sth->errstr;
alarm(0);
};
More information about the freeside-commits
mailing list