From d10be359036b13007080d965d45d70da0011a999 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 9 Sep 2018 01:26:35 +0100 Subject: [PATCH] imagery: workaround mapserv defer memory leak --- cookbooks/imagery/resources/site.rb | 3 +-- cookbooks/imagery/templates/default/mapserver.map.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index e18508491..19d18e5a4 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -105,8 +105,7 @@ action :create do "MS_ERRORFILE" => "stderr", "GDAL_CACHEMAX" => "128" limit_nofile 16384 - memory_high "512M" - memory_max "1G" + memory_max "2G" user "imagery" group "imagery" exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}.socket" diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb index 84a3803d0..d44f3ec78 100644 --- a/cookbooks/imagery/templates/default/mapserver.map.erb +++ b/cookbooks/imagery/templates/default/mapserver.map.erb @@ -49,6 +49,6 @@ MAP STATUS DEFAULT TYPE RASTER PROCESSING "RESAMPLE=AVERAGE" - PROCESSING "CLOSE_CONNECTION=DEFER" + PROCESSING "CLOSE_CONNECTION=NORMAL" END # layer END -- 2.43.2