Branch: refs/heads/master
Home: https://github.com/jenkinsci/infra-puppet
Commit: 743b027d8fbbad2ac8bc85813d7008c0155f468b
https://github.com/jenkinsci/infra-puppet/commit/743b027d8fbbad2ac8bc85813d7008c0155f468b
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
A modules/confluence/files/server.xml
Log Message:
-----------
putting the current version as-is as the baseline
Commit: 94fc15cc30f6ccceb95bb415445f7ff49bb1ac2d
https://github.com/jenkinsci/infra-puppet/commit/94fc15cc30f6ccceb95bb415445f7ff49bb1ac2d
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M modules/confluence/files/confluence.init
M modules/confluence/files/server.xml
A modules/confluence/files/setenv.sh
M modules/confluence/manifests/init.pp
Log Message:
-----------
put the CATALINA_BASE under puppet.
This will help us better externalize the configuration without touching
Confluence too much
Commit: ce0d8961629fbd7860cb0c7e03ecfabdc0df4eed
https://github.com/jenkinsci/infra-puppet/commit/ce0d8961629fbd7860cb0c7e03ecfabdc0df4eed
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M modules/confluence/files/setenv.sh
Log Message:
-----------
this is the current setting defined in /srv/wiki/current/bin/setenv.sh
Commit: 6fb4a8d2a70e94b76fc021832a065b8c9bb5cf0f
https://github.com/jenkinsci/infra-puppet/commit/6fb4a8d2a70e94b76fc021832a065b8c9bb5cf0f
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M modules/confluence/files/setenv.sh
Log Message:
-----------
Trimming a bit off from memory allocation from Wiki.
Background:
We've seen OOM situation on eggplant today, and immediately after I adjusted
oom_adj, I saw JIRA got killed by OOM killer. So I think we are still eating
too much memory.
Looking at top, I see that Confluence is using more memory than JIRA, and now
thanks to the static cache, the load on Confluence should be lower. So I'm
taking away some memory from Confluence in the hope that this improves the
situation
PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
886 wiki 20 0 1537m 979m 5120 S 10 39.0 30:59.76 java
14836 jira 20 0 1163m 859m 18m S 2 34.2 6:05.49 java
Compare:
https://github.com/jenkinsci/infra-puppet/compare/9d591d1d4bda...6fb4a8d2a70e
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
