[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 5cf254fb3e63fb3e700cbfc743fcf5270c8e4d0c

[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_2 has been updated
       via  5cf254fb3e63fb3e700cbfc743fcf5270c8e4d0c (commit)
      from  94051cef50fe8a7248ba305db60e50ae27384c17 (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 5cf254fb3e63fb3e700cbfc743fcf5270c8e4d0c
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Oct 18 14:54:08 2012 -0400

    Rollback cstore transaction before bbag record load
    
    To avoid timeouts, which results in transaction rollbacks, preemptively
    roll back the bookbag fetching cstore transaction before we retrieve
    what could be a very large list of bookbag records data.
    
    Conflicts:
    
    	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 285c5f6..a35fef6 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1670,6 +1670,11 @@ sub load_myopac_bookbags {
                 }
             }
 
+            # we're done with our CStoreEditor.  Rollback here so 
+            # later calls don't cause a timeout, resulting in a 
+            # transaction rollback under the covers.
+            $e->rollback;
+
             my $query = $self->_prepare_bookbag_container_query(
                 $bookbag->id, $sorter, $modifier
             );
@@ -1684,6 +1689,7 @@ sub load_myopac_bookbags {
             my $items = $U->bib_container_items_via_search($bookbag->id, $query, $args)
                 or return Apache2::Const::HTTP_INTERNAL_SERVER_ERROR;
 
+
             my (undef, @recs) = $self->get_records_and_facets(
                 [ map {$_->target_biblio_record_entry->id} @$items ],
                 undef, 
@@ -1696,7 +1702,10 @@ sub load_myopac_bookbags {
         }
     }
 
+    # this rollback may be a dupe, but that's OK because 
+    # cstoreditor ignores dupe rollbacks
     $e->rollback;
+
     return Apache2::Const::OK;
 }
 

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

Summary of changes:
 .../lib/OpenILS/WWW/EGCatLoader/Account.pm         |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS