[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. d9029b830432efb9f45472ee8e21d27770e7a334

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_4 has been updated
       via  d9029b830432efb9f45472ee8e21d27770e7a334 (commit)
      from  b45c605197c31e2a515cb4382097953e72105179 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d9029b830432efb9f45472ee8e21d27770e7a334
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Aug 27 10:38:48 2012 -0400

    Repair fine generator memory leak
    
    Calling "next" from within a "try" block results in a memory leak,
    presumably because "try" is a tangled nest of subs and evals.
    Replacing the "try" with a good ol' "eval" avoids the leak.
    
    This can be reproduced with the following:
    
    ---------
    use Error qw/:try/;
    
    foreach (0..200000) {
        try {
            next;
        } catch Error with {
        };
    }
    ---------
    
    This particular leak in the fine generator is onerous when the fine
    generator is run often (e.g. every 15 mins), which means circs that
    have already been processed for the day are re-analzyed over and over,
    causing the code to continue early (next) to the next loop iteration
    for large numbers of circs.  It also happens when a circs are skipped
    because they have no fine interval, rate, or max fine.
    
    You know this is happening because you will see something like this in
    the storage stderr log:
    
    Exiting eval via next at
    /usr/local/share/perl/5.10.1/OpenILS/Application/Storage/Publisher/action.pm
    line 820.
    
    Exiting subroutine via next at
    /usr/local/share/perl/5.10.1/OpenILS/Application/Storage/Publisher/action.pm
    line 820.
    
    This patch does not avoid the "exiting eval via next" warning, since
    we're still next'ing out of the eval.  It just avoids the memory leak
    (and the "Exiting subroutine" warning).  More extensive refactoring is
    needed to to completely remove the second warning.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index ed5c4ad..16e698f 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1052,7 +1052,7 @@ sub generate_fines {
         #TODO: reservation grace periods
         my $grace_period = ($is_reservation ? 0 : interval_to_seconds($c->grace_period));
 
-		try {
+		eval {
 			if ($self->method_lookup('open-ils.storage.transaction.current')->run) {
 				$log->debug("Cleaning up after previous transaction\n");
 				$self->method_lookup('open-ils.storage.transaction.rollback')->run;
@@ -1238,13 +1238,15 @@ sub generate_fines {
 			    )->gather(1);
 			}
 
-		} catch Error with {
-			my $e = shift;
+		};
+
+		if ($@) {
+			my $e = $@;
 			$client->respond( "Error processing overdue $ctype [".$c->id."]:\n\n$e\n" );
 			$log->error("Error processing overdue $ctype [".$c->id."]:\n$e\n");
 			$self->method_lookup('open-ils.storage.transaction.rollback')->run;
-			throw $e if ($e =~ /IS NOT CONNECTED TO THE NETWORK/o);
-		};
+			last if ($e =~ /IS NOT CONNECTED TO THE NETWORK/o);
+		}
 	}
 }
 __PACKAGE__->register_method(

-----------------------------------------------------------------------

Summary of changes:
 .../Application/Storage/Publisher/action.pm        |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS