/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz12298-opcachesegfault.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz12298-opcachesegfault.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sun Sep 10 03:48:38 2023 UTC (14 months, 2 weeks ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-31_el7_sme, smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, HEAD 
* Sat Sep 09 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-28.sme
- workaround opcache segfault with php 81 using in memory only [SME: 12298]
1 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base
2 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base 2023-09-09 23:28:01.292000000 -0400
3 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base 2023-09-09 23:40:19.781000000 -0400
4 @@ -1,9 +1,9 @@
5 opcache.enable=1
6 opcache.file_cache= /var/opt/remi/php74/lib/php/opcache
7 opcache.enable_cli= 1
8 -opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 32;}
9 -opcache.max_accelerated_files= 10000
10 -opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 128;}
11 ++opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 64;}
12 ++opcache.max_accelerated_files= {$nextcloud{'opcache.max_accelerated_files'} || 65406;}
13 ++opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 512;}
14 opcache.save_comments= 1
15 opcache.revalidate_freq= 1
16
17 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base
18 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base 2023-09-09 23:28:01.301000000 -0400
19 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base 2023-09-09 23:38:22.615000000 -0400
20 @@ -1,9 +1,9 @@
21 opcache.enable=1
22 opcache.file_cache= /var/opt/remi/php81/lib/php/opcache
23 opcache.enable_cli= 1
24 -opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 32;}
25 -opcache.max_accelerated_files= 10000
26 -opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 128;}
27 +opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 64;}
28 +opcache.max_accelerated_files= {$nextcloud{'opcache.max_accelerated_files'} || 65406;}
29 +opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 512;}
30 opcache.save_comments= 1
31 opcache.revalidate_freq= 1
32
33 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
34 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2023-09-09 23:28:01.294000000 -0400
35 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2023-09-09 23:39:03.537000000 -0400
36 @@ -22,8 +22,9 @@
37 my $start_servers = $nextcloud{'PHPstartServers'} || 6;
38 my $max_spare_servers = $nextcloud{'PHPmaxServers'} || 8;
39 my $max_requests = $nextcloud{'PHPmaxRequests'} || 1000;
40 - my $opcacheBuff = $nextcloud{'opcache.interned_strings_buffer'} || 16;
41 - my $opcacheMem = $nextcloud{'opcache.memory_consumption'} || 128;
42 + my $opcacheBuff = $nextcloud{'opcache.interned_strings_buffer'} || 64;
43 + my $opcacheMem = $nextcloud{'opcache.memory_consumption'} || 512;
44 + my $opcacheAccFiles = $nextcloud{'opcache.max_accelerated_files'} || 65406;
45 $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
46 $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 + $min_spare_servers/2 ) : $start_servers;
47
48 @@ -67,14 +68,16 @@
49
50 ; Set opcache settings
51 ;php_value[opcache.enable]=1 ;if already set in php.d/20-opcache.ini will issue warning
52 -php_value[opcache.file_cache] = /var/lib/php/$id/opcache
53 +; we disable file caching as it crashes opcache on php81 (/var/lib/php/$id/opcache)
54 +; will only slow on php restart as it needs cache rebuilding instead of loading the file cache.
55 +php_value[opcache.file_cache] =
56 php_value[opcache.enable_cli] = 1
57 php_value[opcache.interned_strings_buffer] = $opcacheBuff
58 -php_value[opcache.max_accelerated_files] = 10000
59 +php_value[opcache.max_accelerated_files] = $opcacheAccFiles
60 php_value[opcache.memory_consumption] = $opcacheMem
61 php_value[opcache.save_comments] = 1
62 php_value[opcache.revalidate_freq] = 1
63 -
64 +php_value[opcache.jit] = off
65 _EOF
66
67 }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed