Bug 26312: Catch ES Client errors, log, and continue indexing when error encountered

This catches a timeout response from the ES server, logs this, and continues the indexing

To test:
1 - perl misc/search_tools/rebuild_elasticsearch.pl
2 - Make the ES server timeout (I don't have good instruction yet)
3 - Watch the job crash
4 - Apply patches
5 - perl misc/search_tools/rebuild_elasticsearch.pl
6 - Make the server timeout
7 - Note the job reports failed commit, and continues

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Bug 26312: (follow-up) Reset buffers even if commit fails

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Bug 26312: (follow-up) Fix whitespace and missing semicolon

Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Koha/Exceptions/Elasticsearch.pm

@@ -1,5 +1,20 @@
 package Koha::Exceptions::Elasticsearch;
 
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
 use Modern::Perl;
 
 use Exception::Class (
@@ -7,11 +22,37 @@ use Exception::Class (
     'Koha::Exceptions::Elasticsearch' => {
         description => 'Something went wrong!',
     },
+    'Koha::Exceptions::Elasticsearch::BadResponse' => {
+        isa         => 'Koha::Exceptions::Elasticsearch',
+        description => 'Bad response received when submitting request to Elasticsearch',
+        fields      => [ 'error', 'details' ]
+    },
     'Koha::Exceptions::Elasticsearch::MARCFieldExprParseError' => {
-        isa => 'Koha::Exceptions::Elasticsearch',
-        description => 'Parse error while processing MARC field expression in mapping',
+        isa         => 'Koha::Exceptions::Elasticsearch',
+        description => 'Error parsing MARC Field Expression'
     }
-
 );
 
+=head1 NAME
+
+Koha::Exceptions::Elasticsearch - Base class for elasticsearch exceptions
+
+=head1 Exceptions
+
+=head2 Koha::Exceptions::Elasticsearch
+
+Generic Elasticsearch exception
+
+=head2 Koha::Exceptions::Elasticsearch::BadResponse
+
+Exception to be used when more a request to ES fails
+
+=head2 Koha::Exceptions::Elasticsearch::MARCFieldExprParseError
+
+Exception to be used when encountering an error parsing MARC Field Expression
+
+=head1 Class methods
+
+=cut
+
 1;

Koha/SearchEngine/Elasticsearch/Indexer.pm

@@ -25,6 +25,7 @@ use base qw(Koha::SearchEngine::Elasticsearch);
 use Data::Dumper;
 
 use Koha::Exceptions;
+use Koha::Exceptions::Elasticsearch;
 use Koha::SearchEngine::Zebra::Indexer;
 use C4::AuthoritiesMarc qw//;
 use C4::Biblio;
@@ -113,15 +114,24 @@ sub update_index {
     }
     my $response;
     if (@body) {
-        my $elasticsearch = $self->get_elasticsearch();
-        $response = $elasticsearch->bulk(
-            index => $self->index_name,
-            type => 'data', # is just hard coded in Indexer.pm?
-            body => \@body
-        );
-        if ($response->{errors}) {
-            carp "One or more ElasticSearch errors occurred when indexing documents";
-        }
+        try{
+            my $elasticsearch = $self->get_elasticsearch();
+            $response = $elasticsearch->bulk(
+                index => $self->index_name,
+                type => 'data', # is just hard coded in Indexer.pm?
+                body => \@body
+            );
+            if ($response->{errors}) {
+                carp "One or more ElasticSearch errors occurred when indexing documents";
+            }
+        } catch {
+            if( ref $_ eq 'Search::Elasticsearch::Error::Timeout' ){
+            Koha::Exceptions::Elasticsearch::BadResponse->throw(
+                error => "Record commit failed.",
+                details => "Timeout",
+            );
+            }
+        };
     }
     return $response;
 }

misc/search_tools/rebuild_elasticsearch.pl

@@ -123,6 +123,7 @@ use MARC::Field;
 use MARC::Record;
 use Modern::Perl;
 use Pod::Usage;
+use Try::Tiny;
 
 my $verbose = 0;
 my $commit = 5000;
@@ -302,12 +303,20 @@ sub _do_reindex {
         push @commit_buffer, $record;
         if ( !( --$commit_count ) ) {
             _log( 1, "Committing $commit records...\n" );
-            my $response = $indexer->update_index( \@id_buffer, \@commit_buffer );
-            _handle_response($response);
+            my $response;
+            try{
+                $response = $indexer->update_index( \@id_buffer, \@commit_buffer );
+                _handle_response($response);
+                _log( 1, "Commit complete\n" );
+            } catch {
+                if( ref $_ eq 'Koha::Exceptions::Elasticsearch::BadResponse'){
+                    _log(1,$_->{error});
+                    _log(2,$_->{details});
+                }
+            };
             $commit_count  = $commit;
             @id_buffer     = ();
             @commit_buffer = ();
-            _log( 1, "Commit complete\n" );
         }
     }