zookeeper: mirror systemd config in test suite (Bug 1492453); r=gps
authorConnor Sheehan <sheehan@mozilla.com>
Thu, 20 Sep 2018 16:57:35 -0400
changeset 6490 e50b99efbc2e
parent 6489 278db23cf565
child 6491 01e4a82aa147
push id3262
push usergszorc@mozilla.com
push dateFri, 21 Sep 2018 00:02:03 +0000
treeherderversion-control-tools@e50b99efbc2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1492453
zookeeper: mirror systemd config in test suite (Bug 1492453); r=gps In a previous commit we added GC logging to the Zookeeper processes by setting environment variables in the systemd unit for those processes. It slipped my mind that we don't use systemd in docker, and need to update in a second location for parity in the test suite. This commit should fix that issue. Differential Revision: https://phabricator.services.mozilla.com/D6447
ansible/roles/docker-hg-ssh/files/supervisor-docker.conf
--- a/ansible/roles/docker-hg-ssh/files/supervisor-docker.conf
+++ b/ansible/roles/docker-hg-ssh/files/supervisor-docker.conf
@@ -16,17 +16,17 @@ redirect_stderr = true
 
 [program:kafka]
 command = /start-kafka
 autorestart = true
 redirect_stderr = true
 user = zookeeper
 
 [program:zookeeper]
-command = java -Xmx1G -Xms1G -cp /opt/zookeeper/lib/slf4j-log4j12-1.6.1.jar:/opt/zookeeper/lib/slf4j-api-1.6.1.jar:/opt/zookeeper/lib/netty-3.10.5.Final.jar:/opt/zookeeper/lib/log4j-1.2.16.jar:/opt/zookeeper/lib/jline-0.9.94.jar:/opt/zookeeper/zookeeper-3.4.11.jar:/etc/zookeeper: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg
+command = java -Xmx1G -Xms1G -cp /opt/zookeeper/lib/slf4j-log4j12-1.6.1.jar:/opt/zookeeper/lib/slf4j-api-1.6.1.jar:/opt/zookeeper/lib/netty-3.10.5.Final.jar:/opt/zookeeper/lib/log4j-1.2.16.jar:/opt/zookeeper/lib/jline-0.9.94.jar:/opt/zookeeper/zookeeper-3.4.11.jar:/etc/zookeeper: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Xloggc:/var/log/zookeeper/gc.log -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGC -XX:+PrintGCTimeStamps -XX:+PrintGCDetails org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg
 autorestart = true
 redirect_stderr = true
 user = zookeeper
 
 [program:pushdataaggregator]
 command=/var/hg/venv_tools/bin/vcsreplicator-aggregator /etc/mercurial/pushdataaggregator.ini
 autorestart = true
 redirect_stderr = true