Skip to content

Commit f918174

Browse files
committed
Tune for large deployments
1 parent 3d7272f commit f918174

File tree

4 files changed

+93
-0
lines changed

4 files changed

+93
-0
lines changed

salt/server/init.sls

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ include:
1616
- server.initial_content
1717
- server.iss
1818
- server.testsuite
19+
- server.large_scale_deployment
1920
- server.salt_master
2021
- server.tcpdump
2122

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{% if grains.get('large_scale_deployment') | default(false, true) %}
2+
3+
include:
4+
- server
5+
6+
large_scale_increase_tasko_parallel_threads:
7+
file.replace:
8+
- name: /etc/rhn/rhn.conf
9+
- pattern: 'taskomatic.com.redhat.rhn.taskomatic.task.MinionActionExecutor.parallel_threads = (.*)'
10+
- repl: 'taskomatic.com.redhat.rhn.taskomatic.task.MinionActionExecutor.parallel_threads = 3'
11+
- append_if_not_found: True
12+
- require:
13+
- cmd: server_setup
14+
15+
large_scale_increase_hibernate_max_connections:
16+
file.replace:
17+
- name: /etc/rhn/rhn.conf
18+
- pattern: 'hibernate.c3p0.max_size = (.*)'
19+
- repl: 'hibernate.c3p0.max_size = 50'
20+
- append_if_not_found: True
21+
- require:
22+
- cmd: server_setup
23+
24+
large_scale_tune_tomcat_stylesheet:
25+
file.managed:
26+
- name: /root/large_scale_tune_tomcat.xslt
27+
- source:
28+
- salt://server/large_scale_tune_tomcat.xslt
29+
- user: root
30+
- group: root
31+
- mode: 644
32+
33+
large_scale_tune_tomcat_maxthreads:
34+
cmd.run:
35+
- name: xsltproc /root/large_scale_tune_tomcat.xslt /etc/tomcat/server.xml > /tmp/tomcat_server.xml && mv /tmp/tomcat_server.xml /etc/tomcat/server.xml
36+
- require:
37+
- cmd: server_setup
38+
- file: large_scale_tune_tomcat_stylesheet
39+
40+
large_scale_tomcat:
41+
service.running:
42+
- name: tomcat
43+
- watch:
44+
- file: large_scale_increase_tasko_parallel_threads
45+
- file: large_scale_increase_hibernate_max_connections
46+
- cmd: large_scale_tune_tomcat_maxthreads
47+
48+
large_scale_increase_database_max_connections:
49+
file.replace:
50+
- name: /var/lib/pgsql/data/postgresql.conf
51+
- pattern: 'max_connections = (.*)'
52+
- repl: 'max_connections = 450'
53+
- append_if_not_found: True
54+
- require:
55+
- cmd: server_setup
56+
57+
large_scale_increase_database_work_memory:
58+
file.replace:
59+
- name: /var/lib/pgsql/data/postgresql.conf
60+
- pattern: 'work_mem = (.*)'
61+
- repl: 'work_mem = 10MB'
62+
- append_if_not_found: True
63+
- require:
64+
- cmd: server_setup
65+
66+
large_scale_postgresql:
67+
service.running:
68+
- name: postgresql
69+
- watch:
70+
- file: large_scale_increase_database_max_connections
71+
- file: large_scale_increase_database_work_memory
72+
73+
{% endif %}
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
2+
<!-- XSL transformation to tune tomcat server
3+
configuration for large scale deployments -->
4+
5+
<xsl:output omit-xml-declaration="yes" />
6+
7+
<!-- increase maximum number of threads -->
8+
<xsl:template match="Service[@name='Catalina']/Connector/@maxThreads">
9+
<xsl:attribute name="maxThreads">256</xsl:attribute>
10+
</xsl:template>
11+
12+
<!-- just copy the rest -->
13+
<xsl:template match="node()|@*">
14+
<xsl:copy>
15+
<xsl:apply-templates select="node()|@*" />
16+
</xsl:copy>
17+
</xsl:template>
18+
</xsl:stylesheet>

salt/server/testsuite.sls

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ tomcat:
155155
- watch:
156156
- file: enable_salt_content_staging_window
157157
- file: enable_salt_content_staging_advance
158+
- file: enable_kiwi_os_image_building
158159

159160
dump_salt_event_log:
160161
cmd.run:

0 commit comments

Comments
 (0)