From 3d40d7cf7fb5ddb37f9df949cbde2448e23c9883 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 17 Dec 2018 12:45:54 -0300 Subject: [PATCH] Bug 16067: Remove FastMmap It is known to be broken, we should remove its implementation Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit fc1158389f5a25ee9d62c2cb84742daa5b97ec50) Signed-off-by: Fridolin Somers (cherry picked from commit 1f73bed9d856dc23239c2e8df679dba4fd2b2b55) Signed-off-by: Andrew Fuerste-Henry --- Koha/Cache.pm | 38 +------------------------------------- cpanfile | 1 - debian/control | 2 -- t/db_dependent/Cache.t | 4 ---- 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/Koha/Cache.pm b/Koha/Cache.pm index 95d0e6ba1b..54fe72f81f 100644 --- a/Koha/Cache.pm +++ b/Koha/Cache.pm @@ -51,7 +51,7 @@ use Koha::Config; use base qw(Class::Accessor); __PACKAGE__->mk_ro_accessors( - qw( cache memcached_cache fastmmap_cache memory_cache )); + qw( cache memcached_cache )); our %L1_cache; our $L1_encoder = Sereal::Encoder->new; @@ -94,15 +94,6 @@ sub new { $self->{'cache'} = $self->{'memcached_cache'}; } - if ( $self->{'default_type'} eq 'fastmmap' - && defined( $ENV{GATEWAY_INTERFACE} ) - && can_load( modules => { 'Cache::FastMmap' => undef } ) - && _initialize_fastmmap($self) - && defined( $self->{'fastmmap_cache'} ) ) - { - $self->{'cache'} = $self->{'fastmmap_cache'}; - } - $ENV{DEBUG} && carp "Selected caching system: " . ($self->{'cache'} // 'none'); return @@ -141,33 +132,6 @@ sub _initialize_memcached { return $self; } -sub _initialize_fastmmap { - my ($self) = @_; - my ($cache, $share_file); - - # Temporary workaround to catch fatal errors when: C4::Context module - # is not loaded beforehand, or Cache::FastMmap init fails for whatever - # other reason (e.g. due to permission issues - see Bug 13431) - eval { - $share_file = join( '-', - "/tmp/sharefile-koha", $self->{'namespace'}, - C4::Context->config('hostname'), C4::Context->config('database') ); - - $cache = Cache::FastMmap->new( - 'share_file' => $share_file, - 'expire_time' => $self->{'timeout'}, - 'unlink_on_exit' => 0, - ); - }; - if ( $@ ) { - warn "FastMmap cache initialization failed: $@"; - return; - } - return unless defined $cache; - $self->{'fastmmap_cache'} = $cache; - return $self; -} - =head2 is_cache_active Routine that checks whether or not a default caching method is active on this diff --git a/cpanfile b/cpanfile index 2ad54996f4..de1d7f88c3 100644 --- a/cpanfile +++ b/cpanfile @@ -133,7 +133,6 @@ recommends 'Archive::Extract', '0.60'; recommends 'Archive::Zip', '1.30'; recommends 'Array::Utils', '0.5'; recommends 'CGI::Session::Driver::memcached', '0.04'; -recommends 'Cache::FastMmap', '1.34'; recommends 'DBD::SQLite2', '0.33'; recommends 'Devel::Cover', '0.89'; recommends 'File::Copy', '2.08'; diff --git a/debian/control b/debian/control index 4c926a1104..1215383e2d 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Build-Depends: libalgorithm-checkdigits-perl, libbusiness-isbn-perl, libbusiness-issn-perl, libbytes-random-secure-perl, - libcache-fastmmap-perl, libcache-memcached-fast-safe-perl, libcache-memcached-perl, libcgi-compile-perl, @@ -256,7 +255,6 @@ Depends: libalgorithm-checkdigits-perl, libbusiness-isbn-perl, libbusiness-issn-perl, libbytes-random-secure-perl, - libcache-fastmmap-perl, libcache-memcached-fast-safe-perl, libcache-memcached-perl, libcgi-compile-perl, diff --git a/t/db_dependent/Cache.t b/t/db_dependent/Cache.t index 3af4f6f9fd..e47393f22c 100644 --- a/t/db_dependent/Cache.t +++ b/t/db_dependent/Cache.t @@ -284,9 +284,5 @@ END { skip "Cache not enabled", 1 unless ( $cache->is_cache_active() ); is( $destructorcount, 1, 'Destructor run exactly once' ); - # cleanup temporary file - my $tmp_file = $cache->{ fastmmap_cache }->{ share_file }; - unlink $tmp_file if defined $tmp_file; - } } -- 2.39.5