Apache/PHP configuration tweaks

In order to improvee IDP responsiveness
follwing actions were taken:

* updated apache connection settings
* removed access log settings from apache2
* updated php pool settings
* added php.ini settings
** added zend opcode cache
** set php max memory limmit to 32MB
* added php-fpm.conf settings
** set emergency_restart settings

Change-Id: I52aafd41267aa46d4f481b7c91a24732c615632b
This commit is contained in:
Sebastian Marcet 2017-04-05 12:18:07 -03:00
parent 8e08ec78b1
commit 49e222aa4a
6 changed files with 2098 additions and 13 deletions

View File

@ -242,4 +242,6 @@ function site_update {
# activate site
rm -rf $SITE_ROOT/w
ln -s $target_dir $SITE_ROOT/w
# to reset op cache
service php5-fpm restart
}

129
files/php-fpm.conf Normal file
View File

@ -0,0 +1,129 @@
;;;;;;;;;;;;;;;;;;;;;
; FPM Configuration ;
;;;;;;;;;;;;;;;;;;;;;
; All relative paths in this configuration file are relative to PHP's install
; prefix (/usr). This prefix can be dynamically changed by using the
; '-p' argument from the command line.
; Include one or more files. If glob(3) exists, it is used to include a bunch of
; files from a glob(3) pattern. This directive can be used everywhere in the
; file.
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
; - /usr otherwise
;include=/etc/php5/fpm/*.conf
;;;;;;;;;;;;;;;;;;
; Global Options ;
;;;;;;;;;;;;;;;;;;
[global]
; Pid file
; Note: the default prefix is /var
; Default Value: none
pid = /var/run/php5-fpm.pid
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
; in a local file.
; Note: the default prefix is /var
; Default Value: log/php-fpm.log
error_log = /var/log/php5-fpm.log
; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
; will be handled differently.
; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
; Default Value: daemon
;syslog.facility = daemon
; syslog_ident is prepended to every message. If you have multiple FPM
; instances running on the same server, you can change the default value
; which must suit common needs.
; Default Value: php-fpm
;syslog.ident = php-fpm
; Log level
; Possible Values: alert, error, warning, notice, debug
; Default Value: notice
;log_level = notice
; If this number of child processes exit with SIGSEGV or SIGBUS within the time
; interval set by emergency_restart_interval then FPM will restart. A value
; of '0' means 'Off'.
; Default Value: 0
emergency_restart_threshold = 10
; Interval of time used by emergency_restart_interval to determine when
; a graceful restart will be initiated. This can be useful to work around
; accidental corruptions in an accelerator's shared memory.
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
emergency_restart_interval = 1m
; Time limit for child processes to wait for a reaction on signals from master.
; Available units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
process_control_timeout = 10s
; The maximum number of processes FPM will fork. This has been design to control
; the global number of processes when using dynamic PM within a lot of pools.
; Use it with caution.
; Note: A value of 0 indicates no limit
; Default Value: 0
; process.max = 128
; Specify the nice(2) priority to apply to the master process (only if set)
; The value can vary from -19 (highest priority) to 20 (lower priority)
; Note: - It will only work if the FPM master process is launched as root
; - The pool process will inherit the master process priority
; unless it specified otherwise
; Default Value: no set
; process.priority = -19
; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
; Default Value: yes
;daemonize = yes
; Set open file descriptor rlimit for the master process.
; Default Value: system defined value
;rlimit_files = 1024
; Set max core size rlimit for the master process.
; Possible Values: 'unlimited' or an integer greater or equal to 0
; Default Value: system defined value
;rlimit_core = 0
; Specify the event mechanism FPM will use. The following is available:
; - select (any POSIX os)
; - poll (any POSIX os)
; - epoll (linux >= 2.5.44)
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
; - /dev/poll (Solaris >= 7)
; - port (Solaris >= 10)
; Default Value: not set (auto detection)
;events.mechanism = epoll
; When FPM is build with systemd integration, specify the interval,
; in second, between health report notification to systemd.
; Set to 0 to disable.
; Available Units: s(econds), m(inutes), h(ours)
; Default Unit: seconds
; Default value: 10
;systemd_interval = 10
;;;;;;;;;;;;;;;;;;;;
; Pool Definitions ;
;;;;;;;;;;;;;;;;;;;;
; Multiple pools of child processes may be started with different listening
; ports and different management options. The name of the pool will be
; used in logs and stats. There is no limitation on the number of pools which
; FPM can handle. Your system will tell you anyway :)
; To configure the pools it is recommended to have one .conf file per
; pool in the following directory:
include=/etc/php5/fpm/pool.d/*.conf

1930
files/php.ini Normal file

File diff suppressed because it is too large Load Diff

View File

@ -9,20 +9,25 @@ listen.group = www-data
pm = dynamic
# the maximum number of children that can be alive at the same time.
pm.max_children = 500
pm.max_children = 800
# the number of children created on startup.
# pm.start_servers = min_spare_servers + (max_spare_servers - min_spare_servers) / 2
pm.start_servers = 120
pm.start_servers = 300
# the minimum number of children in 'idle'
# state (waiting to process). If the number
# of 'idle' processes is less than this
# number then some children will be created.
pm.min_spare_servers = 80
pm.min_spare_servers = 256
# the maximum number of children in 'idle'
# state (waiting to process). If the number
# of 'idle' processes is greater than this
# number then some children will be killed.
pm.max_spare_servers = 160
pm.max_requests = 1500
pm.max_spare_servers = 600
pm.max_requests = 5000
listen.backlog = -1
request_terminate_timeout = 300s
chdir = /

View File

@ -106,6 +106,30 @@ class openstackid (
notify => Service['php5-fpm'],
}
file { '/etc/php5/fpm/php-fpm.conf':
ensure => present,
owner => 'root',
group => 'www-data',
mode => '0640',
source => 'puppet:///modules/openstackid/php-fpm.conf',
require => [
Package['php5-fpm'],
],
notify => Service['php5-fpm'],
}
file { '/etc/php5/fpm/php.ini':
ensure => present,
owner => 'root',
group => 'www-data',
mode => '0640',
source => 'puppet:///modules/openstackid/php.ini',
require => [
Package['php5-fpm'],
],
notify => Service['php5-fpm'],
}
file { '/etc/php5/fpm/pool.d/www.conf':
ensure => present,
owner => 'root',
@ -264,12 +288,10 @@ class openstackid (
# apache mpm event connection tweaking
class {'::apache::mod::event':
serverlimit => 128,
serverlimit => 16,
startservers => 3,
minsparethreads => 96,
maxsparethreads => 192,
threadlimit => 64,
threadsperchild => 32,
threadlimit => 256,
threadsperchild => 256,
maxclients => 4096,
maxrequestsperchild => 5000,
maxrequestworkers => 4096,

View File

@ -4,8 +4,6 @@
ErrorLog ${APACHE_LOG_DIR}/openstackid-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/openstackid-access.log combined
Redirect / https://<%= scope.lookupvar("openstackid::vhost_name") %>/
</VirtualHost>
@ -17,7 +15,6 @@
ErrorLog ${APACHE_LOG_DIR}/openstackid-ssl-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/openstackid-ssl-access.log combined
SSLEngine on
SSLProtocol All -SSLv2 -SSLv3