[open-ils-commits] [GIT] Evergreen ILS branch master updated. ac5e878489116c5987cf16bfa5fe139e81829252
Evergreen Git
git at git.evergreen-ils.org
Wed Jan 25 15:25:10 EST 2017
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, master has been updated
via ac5e878489116c5987cf16bfa5fe139e81829252 (commit)
via c7feda1e50186362d16d49edf22c1574aa594b43 (commit)
via 5b9cc11248dbd3ee17c4346d6250703e706d1c2d (commit)
from cbe4caec19cabfc4696b433cd63389ff4447e335 (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 ac5e878489116c5987cf16bfa5fe139e81829252
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Jan 25 12:33:24 2017 -0500
LP#1657885: Inform Vandelay of new chunking/bundling logic, part deux
Here we conditionally use the old "max_chunk_count" method provided by OpenSRF
when Evergreen is running atop a version that doesn't know about the bundling
rename.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index a56be96..ba64b14 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -239,6 +239,8 @@ sub process_spool {
my $filename = shift;
my $bib_source = shift;
+ $client->max_chunk_count($self->{max_bundle_count}) if (!$client->can('max_bundle_count') && $self->{max_bundle_count});
+
my $e = new_editor(authtoken => $auth, xact => 1);
return $e->die_event unless $e->checkauth;
@@ -330,7 +332,6 @@ __PACKAGE__->register_method(
method => "process_spool",
api_level => 1,
argc => 3,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'bib'
);
@@ -339,7 +340,6 @@ __PACKAGE__->register_method(
method => "process_spool",
api_level => 1,
argc => 3,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'auth'
);
@@ -350,7 +350,6 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 3,
stream => 1,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'bib'
);
@@ -360,7 +359,6 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 3,
stream => 1,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'auth'
);
@@ -783,7 +781,6 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 2,
stream => 1,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'bib',
signature => {
@@ -800,13 +797,14 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 2,
stream => 1,
- #max_chunk_size => 0,
max_bundle_count => 1,
record_type => 'auth'
);
sub import_queue {
my($self, $conn, $auth, $q_id, $options) = @_;
+ $conn->max_chunk_count($self->{max_bundle_count}) if (!$conn->can('max_bundle_count') && $self->{max_bundle_count});
+
my $e = new_editor(authtoken => $auth, xact => 1);
return $e->die_event unless $e->checkauth;
$options ||= {};
commit c7feda1e50186362d16d49edf22c1574aa594b43
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Jan 25 10:56:23 2017 -0500
LP#1657885: Inform Vandelay of new chunking/bundling logic
There is a naive attempt to force immediate streaming of results in Vandelay
for certain processes, but it both only helps a little, and breaks under the
new OpenSRF bundling/chunking logic. So, we'll drop it where it's not
directly configurable, and test for the appropriate features where we can.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index 39c857f..a56be96 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -330,7 +330,8 @@ __PACKAGE__->register_method(
method => "process_spool",
api_level => 1,
argc => 3,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'bib'
);
__PACKAGE__->register_method(
@@ -338,7 +339,8 @@ __PACKAGE__->register_method(
method => "process_spool",
api_level => 1,
argc => 3,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'auth'
);
@@ -348,7 +350,8 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 3,
stream => 1,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'bib'
);
__PACKAGE__->register_method(
@@ -357,7 +360,8 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 3,
stream => 1,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'auth'
);
@@ -779,7 +783,8 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 2,
stream => 1,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'bib',
signature => {
desc => q/
@@ -795,7 +800,8 @@ __PACKAGE__->register_method(
api_level => 1,
argc => 2,
stream => 1,
- max_chunk_size => 0,
+ #max_chunk_size => 0,
+ max_bundle_count => 1,
record_type => 'auth'
);
@@ -901,7 +907,7 @@ sub import_record_list_impl {
report_all => $$args{report_all}
};
- $conn->max_chunk_count(1) if $$args{report_all};
+ $conn->max_chunk_count(1) if (!$conn->can('max_bundle_size') && $conn->can('max_chunk_size') && $$args{report_all});
my $auto_overlay_exact = $$args{auto_overlay_exact};
my $auto_overlay_1match = $$args{auto_overlay_1match};
commit 5b9cc11248dbd3ee17c4346d6250703e706d1c2d
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Jan 19 15:54:53 2017 -0500
LP#1657885: Account for new bundling/chunking logic in OpenSRF 2.5+
When chunking was renamed bundling and actually chunking added in OpenSRF 2.5,
the few places in Evergreen that tried to make use of the old mechanism
directly now break. The most obvious breakage is in the alternate printable
hold pull list, which we fix here. Evidence of other broken code should
be fixed as needed, though spots to look our for are z39.50 results and
Vandelay processing.
To test:
1) In Evergreen 2.11 running on top of OpenSRF 2.5+, attempt to use the
alt pull list printing interface at a location with many holds on their
pull list. The progress bar will spin forever.
2) After applying this patch, do the same. The interface should work
quickly.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 5d08462..52f0893 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1691,7 +1691,7 @@ sub print_hold_pull_list_stream {
delete($$params{chunk_size}) unless (int($$params{chunk_size}));
delete($$params{chunk_size}) if ($$params{chunk_size} && $$params{chunk_size} > 50); # keep the size reasonable
$$params{chunk_size} ||= 10;
- $client->max_chunk_size($$params{chunk_size}) if ($client->can('max_chunk_size'));
+ $client->max_chunk_size($$params{chunk_size}) if (!$client->can('max_bundle_size') && $client->can('max_chunk_size'));
$$params{org_id} = (defined $$params{org_id}) ? $$params{org_id}: $e->requestor->ws_ou;
return $e->die_event unless $e->allowed('VIEW_HOLD', $$params{org_id });
@@ -2230,7 +2230,7 @@ sub print_expired_holds_stream {
delete($$params{chunk_size}) unless (int($$params{chunk_size}));
delete($$params{chunk_size}) if ($$params{chunk_size} && $$params{chunk_size} > 50); # keep the size reasonable
$$params{chunk_size} ||= 10;
- $client->max_chunk_size($$params{chunk_size});
+ $client->max_chunk_size($$params{chunk_size}) if (!$client->can('max_bundle_size') && $client->can('max_chunk_size'));
$$params{org_id} = (defined $$params{org_id}) ? $$params{org_id}: $e->requestor->ws_ou;
@@ -3517,7 +3517,7 @@ sub clear_shelf_cache {
return $e->die_event unless $e->checkauth and $e->allowed('VIEW_HOLD');
$chunk_size ||= 25;
- $client->max_chunk_size($chunk_size) if ($client->can('max_chunk_size'));
+ $client->max_chunk_size($chunk_size) if (!$client->can('max_bundle_size') && $client->can('max_chunk_size'));
my $hold_data = OpenSRF::Utils::Cache->new('global')->get_cache($cache_key);
@@ -3628,7 +3628,7 @@ sub clear_shelf_process {
my @holds;
my @canceled_holds; # newly canceled holds
$chunk_size ||= 25; # chunked status updates
- $client->max_chunk_size($chunk_size) if ($client->can('max_chunk_size'));
+ $client->max_chunk_size($chunk_size) if (!$client->can('max_bundle_size') && $client->can('max_chunk_size'));
my $counter = 0;
for my $hold_id (@hold_ids) {
-----------------------------------------------------------------------
Summary of changes:
.../perlmods/lib/OpenILS/Application/Circ/Holds.pm | 8 ++++----
.../perlmods/lib/OpenILS/Application/Vandelay.pm | 18 +++++++++++-------
2 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list