Skip to content

Commit

Permalink
Set LS_HEAP_SIZE correctly to 1g
Browse files Browse the repository at this point in the history
Previously we had set heap size to 1g in a few places, but not everywhere

Fixes elastic#4550
  • Loading branch information
suyograo committed Jan 22, 2016
1 parent 3fcd55c commit c136d58
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bin/logstash
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# See 'bin/logstash help' for a list of commands.
#
# Supported environment variables:
# LS_HEAP_SIZE="xxx" size for the -Xmx${LS_HEAP_SIZE} maximum Java heap size option, default is "500m"
# LS_HEAP_SIZE="xxx" size for the -Xmx${LS_HEAP_SIZE} maximum Java heap size option, default is "1g"
# LS_JAVA_OPTS="xxx" to append extra options to the defaults JAVA_OPTS provided by logstash
# JAVA_OPTS="xxx" to *completely override* the defauls set of JAVA_OPTS provided by logstash
#
Expand Down
2 changes: 1 addition & 1 deletion pkg/logstash.default
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#LS_OPTS=""

# Arguments to pass to java
#LS_HEAP_SIZE="500m"
#LS_HEAP_SIZE="1g"
#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"

# pidfiles aren't used for upstart; this is for sysv users.
Expand Down
2 changes: 1 addition & 1 deletion pkg/logstash.sysv
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pidfile="/var/run/$name.pid"
LS_USER=logstash
LS_GROUP=logstash
LS_HOME=/var/lib/logstash
LS_HEAP_SIZE="500m"
LS_HEAP_SIZE="1g"
LS_LOG_DIR=/var/log/logstash
LS_LOG_FILE="${LS_LOG_DIR}/$name.log"
LS_CONF_DIR=/etc/logstash/conf.d
Expand Down
2 changes: 1 addition & 1 deletion pkg/logstash.sysv.debian
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
LS_USER=logstash
LS_GROUP=logstash
LS_HOME=/var/lib/logstash
LS_HEAP_SIZE="500m"
LS_HEAP_SIZE="1g"
LS_LOG_FILE=/var/log/logstash/$NAME.log
LS_CONF_DIR=/etc/logstash/conf.d
LS_OPEN_FILES=16384
Expand Down
2 changes: 1 addition & 1 deletion pkg/logstash.sysv.redhat
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
LS_USER=logstash
LS_GROUP=logstash
LS_HOME=/var/lib/logstash
LS_HEAP_SIZE="500m"
LS_HEAP_SIZE="1g"
LS_LOG_FILE=/var/log/logstash/$NAME.log
LS_CONF_DIR=/etc/logstash/conf.d
LS_OPEN_FILES=16384
Expand Down
2 changes: 1 addition & 1 deletion pkg/logstash.upstart.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ script
# Defaults
PATH=/bin:/usr/bin
LS_HOME=/var/lib/logstash
LS_HEAP_SIZE="500m"
LS_HEAP_SIZE="1g"
LS_LOG_FILE=/var/log/logstash/logstash.log
LS_USE_GC_LOGGING=""
LS_CONF_DIR=/etc/logstash/conf.d
Expand Down

0 comments on commit c136d58

Please sign in to comment.