gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40947: Remove warning "Aborted connection" from t/db_dependent/www/search_utf8.t 

We sent a SIGKILL to the daemon which does not let it cleanup

Updating to SIGTERM (15) and handle the dbh disconnect gracefully in the
daemon.

Also handle SIGINT (ctrl+c) only because I think it can be useful (?)

Test plan:
  prove t/db_dependent/www/search_utf8.t

=> Without this patch there are 3 warnings in the DB container log
db-1         | 2025-10-03 12:30:57 362 [Warning] Aborted connection 42 to db: 'koha_kohadev' user: 'koha_kohadev' host: '172.19.0.6' (Got an error reading communication packets)
=> With this patch applied there are none.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ebfbd0da26)
Signed-off-by: Jacob O'Mara <Jacob.omara@openfifth.co.uk>
This commit is contained in:
Jonathan Druart 2025-10-03 14:34:07 +02:00 committed by Jacob O'Mara
parent 328285054d
commit 03057a125f
No known key found for this signature in database
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/migration_tools/rebuild_zebra.pl
View File

@ -254,6 +254,17 @@ my $dbh;
# option (wait-for-lock) is provided to let the program wait for the lock.
# See https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11078 for details.
if ($daemon_mode) {
$SIG{TERM} = sub {
$dbh->disconnect if $dbh;
exit 0;
};
$SIG{INT} = sub {
$dbh->disconnect if $dbh;
exit 0;
};
while (1) {
# For incremental updates, skip the update if the updates are locked

4
t/lib/Mocks/Zebra.pm
View File

@ -274,8 +274,8 @@ Missing POD for cleanup.
sub cleanup {
my ($self) = @_;
kill 9, $self->{zebra_pid} if defined $self->{zebra_pid};
kill 9, $self->{indexer_pid} if defined $self->{indexer_pid};
kill 15, $self->{zebra_pid} if defined $self->{zebra_pid};
kill 15, $self->{indexer_pid} if defined $self->{indexer_pid};
# Clean up the Zebra files since the child process was just shot
rmtree $self->{datadir};