Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356517 )
Change subject: gerrit: import systemd unit file from deb to puppet ...................................................................... gerrit: import systemd unit file from deb to puppet As a second step after Ib3acbe3b17351, import the systemd unit file from the Debian package into the puppet repo, in the correct location for base::service_unit. In addition add the (missing) "Limit" lines that should replace the ulimit lines from the sysvinit init script, as Paladox suggested on I8499dac8edbb3815. Not having those most likely caused the issue we experienced today with Gerrit opening too many files. Just instead of adding more things to the package we are adding it here in puppet right away. NOT actually setting "systemd => true" in base::service_unit, the Limit settings especially need more testing. Change-Id: Ie2ccf1386754cc2224bc62d723f9e45170bb4566 --- A modules/gerrit/templates/initscripts/gerrit.systemd.erb 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/356517/1 diff --git a/modules/gerrit/templates/initscripts/gerrit.systemd.erb b/modules/gerrit/templates/initscripts/gerrit.systemd.erb new file mode 100644 index 0000000..0cc3bce --- /dev/null +++ b/modules/gerrit/templates/initscripts/gerrit.systemd.erb @@ -0,0 +1,31 @@ +[Unit] +Description=Gerrit code review tool +After=network.target + +[Service] +User=gerrit2 +Group=gerrit2 +Type=simple +PIDFile=/var/lib/gerrit2/review_site/logs/gerrit.pid +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=gerrit2 +EnvironmentFile=/etc/default/gerrit +ExecStart=/var/lib/gerrit2/review_site/bin/gerrit.sh start +ExecReload=/var/lib/gerrit2/review_site/bin/gerrit.sh reload +ExecStop=/var/lib/gerrit2/review_site/bin/gerrit.sh stop + +# default gerrit ulimits set by the init.d script... your choice +LimitCORE=0 +LimitDATA=infinity +LimitFSIZE=infinity +LimitRSS=infinity +# NOFILE : GERRIT_FDS, determined by "core.packedGitOpenFiles" in the script +LimitNOFILE=65536 +LimitCPU=infinity +LimitAS=infinity +LimitLOCKS=infinity + +[Install] +WantedBy=multi-user.target + -- To view, visit https://gerrit.wikimedia.org/r/356517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2ccf1386754cc2224bc62d723f9e45170bb4566 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits