From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 27 Aug 2012 14:38:48 +0000 (-0400)
Subject: Repair fine generator memory leak
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8ba10e552f44aaa18d5085be8dfef4307ae2b3e0;p=evergreen%2Fequinox.git

Repair fine generator memory leak

Calling "next" from with a "try" block results in a memory leak,
presumably because "try" is a sub wrapped in an eval (or vice versa,
whatever, it leaks).  Replacing the "try" with an "eval" avoids the
leak.

This particular leak in the fine generator is onerous when there are
many circulations that are skipped (i.e. next'ed) in the main loop
because they have no fine interval, rate, or max fine.  This is seen
in the osrfsys logs as:

Fine Generator skipping circ 11995439 due to 0 fine interval, 0 fine
rate, or 0 max fine.

And accompanied in the stderr log by:

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.

Signed-off-by: Bill Erickson <berick@esilibrary.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 ddca93e201..f661f9b60d 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
@@ -792,7 +792,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;
@@ -992,13 +992,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(