This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-docker.git
The following commit(s) were added to refs/heads/master by this push: new efda76d Allow custom JVM memory via environment variables (#111) efda76d is described below commit efda76d2d24aecd3a51b2818fd27a64d64cd32a5 Author: 小陈 <jamiechen....@gmail.com> AuthorDate: Thu Sep 26 16:57:41 2024 +0800 Allow custom JVM memory via environment variables (#111) * Enanle custom jvm memery by setting environment variable * Remove 'registry docker.io' field from controller StatefulSet configuration * Replace env name of jvmMemory * Rename nameserver jvm env * Lowered JVM memory requirements * Updated resource limits for the broker * Update scripts in the image-build directory * Update * Remove automatic heap memory calculation * Update * Update helm chart * Update * Adjust the default memory size --- image-build-ci/Dockerfile-ubuntu | 19 ++--- image-build-ci/scripts/runbroker-customize.sh | 85 ++-------------------- image-build-ci/scripts/runserver-customize.sh | 81 +-------------------- image-build/scripts/runbroker-customize.sh | 85 ++-------------------- image-build/scripts/runserver-customize.sh | 81 +-------------------- .../templates/broker/statefulset.yaml | 2 +- .../templates/controller/statefulset.yaml | 2 +- rocketmq-k8s-helm/values.yaml | 5 +- 8 files changed, 30 insertions(+), 330 deletions(-) diff --git a/image-build-ci/Dockerfile-ubuntu b/image-build-ci/Dockerfile-ubuntu index c41042f..cab246e 100644 --- a/image-build-ci/Dockerfile-ubuntu +++ b/image-build-ci/Dockerfile-ubuntu @@ -21,7 +21,7 @@ FROM $BASE_IMAGE USER root RUN apt-get update && apt-get install -y --no-install-recommends \ - bash vim unzip telnet openssl wget gnupg ca-certificates + bash vim unzip telnet openssl wget gnupg ca-certificates ARG version @@ -50,23 +50,24 @@ RUN chown -R ${uid}:${gid} ${ROCKETMQ_HOME} EXPOSE 9876 8080 8081 7001 2023 RUN wget https://repo1.maven.org/maven2/org/jacoco/jacoco/0.8.8/jacoco-0.8.8.zip -O jacoco-0.8.8.zip && \ -unzip jacoco-0.8.8.zip -d jacoco + unzip jacoco-0.8.8.zip -d jacoco ENV JAVA_OPT="-javaagent:${ROCKETMQ_HOME}/jacoco/lib/jacocoagent.jar=includes=*,output=tcpserver,port=2023,address=0.0.0.0" RUN mv ${ROCKETMQ_HOME}/bin/runserver-customize.sh ${ROCKETMQ_HOME}/bin/runserver.sh \ - && mv ${ROCKETMQ_HOME}/bin/tools-customize.sh ${ROCKETMQ_HOME}/bin/tools.sh \ - && chmod a+x ${ROCKETMQ_HOME}/bin/runserver.sh \ - && chmod a+x ${ROCKETMQ_HOME}/bin/mqadmin \ - && chmod a+x ${ROCKETMQ_HOME}/bin/mqnamesrv \ - && chmod a+x ${ROCKETMQ_HOME}/bin/mqproxy + && mv ${ROCKETMQ_HOME}/bin/tools-customize.sh ${ROCKETMQ_HOME}/bin/tools.sh \ + && chmod a+x ${ROCKETMQ_HOME}/bin/runserver.sh \ + && chmod a+x ${ROCKETMQ_HOME}/bin/mqadmin \ + && chmod a+x ${ROCKETMQ_HOME}/bin/mqnamesrv \ + && chmod a+x ${ROCKETMQ_HOME}/bin/mqproxy \ + && chmod a+x ${ROCKETMQ_HOME}/bin/mqcontroller # Expose broker port EXPOSE 10909 10911 10912 RUN mv ${ROCKETMQ_HOME}/bin/runbroker-customize.sh ${ROCKETMQ_HOME}/bin/runbroker.sh \ - && chmod a+x ${ROCKETMQ_HOME}/bin/runbroker.sh \ - && chmod a+x ${ROCKETMQ_HOME}/bin/mqbroker + && chmod a+x ${ROCKETMQ_HOME}/bin/runbroker.sh \ + && chmod a+x ${ROCKETMQ_HOME}/bin/mqbroker # export Java options RUN export JAVA_OPT=" -Duser.home=/opt" diff --git a/image-build-ci/scripts/runbroker-customize.sh b/image-build-ci/scripts/runbroker-customize.sh index ae780aa..553875d 100755 --- a/image-build-ci/scripts/runbroker-customize.sh +++ b/image-build-ci/scripts/runbroker-customize.sh @@ -50,93 +50,18 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH} #=========================================================================================== # JVM Configuration #=========================================================================================== -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m| sed -n '2p' | awk '{print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} -calculate_heap_sizes +# Set default JVM memory options if not provided +DEFAULT_HEAP_OPTS="-Xms2g -Xmx2g -Xmn1g -XX:MaxDirectMemorySize=1g" +HEAP_OPTS=${HEAP_OPTS:-$DEFAULT_HEAP_OPTS} -# Dynamically calculate parameters, for reference. -Xms=$MAX_HEAP_SIZE -Xmx=$MAX_HEAP_SIZE -Xmn=$HEAP_NEWSIZE -MaxDirectMemorySize=$MAX_HEAP_SIZE -# Set for `JAVA_OPT`. -JAVA_OPT="${JAVA_OPT} -server -Xms${Xms} -Xmx${Xmx} -Xmn${Xmn}" +# Setting JAVA options +JAVA_OPT="${JAVA_OPT} -server ${HEAP_OPTS}" JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8" JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/dev/shm/mq_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy" JAVA_OPT="${JAVA_OPT} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m" JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow" JAVA_OPT="${JAVA_OPT} -XX:+AlwaysPreTouch" -JAVA_OPT="${JAVA_OPT} -XX:MaxDirectMemorySize=${MaxDirectMemorySize}" JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages -XX:-UseBiasedLocking" JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${BASE_DIR}/lib" #JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n" diff --git a/image-build-ci/scripts/runserver-customize.sh b/image-build-ci/scripts/runserver-customize.sh index 92f685b..e07b54c 100755 --- a/image-build-ci/scripts/runserver-customize.sh +++ b/image-build-ci/scripts/runserver-customize.sh @@ -50,86 +50,11 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH} #=========================================================================================== # JVM Configuration #=========================================================================================== -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m| sed -n '2p' | awk '{print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} - -calculate_heap_sizes +DEFAULT_HEAP_OPTS="-Xms1g -Xmx1g -Xmn512M" +HEAP_OPTS=${HEAP_OPTS:-$DEFAULT_HEAP_OPTS} -# Dynamically calculate parameters, for reference. -Xms=$MAX_HEAP_SIZE -Xmx=$MAX_HEAP_SIZE -Xmn=$HEAP_NEWSIZE # Set for `JAVA_OPT`. -JAVA_OPT="${JAVA_OPT} -server -Xms${Xms} -Xmx${Xmx} -Xmn${Xmn}" +JAVA_OPT="${JAVA_OPT} -server ${HEAP_OPTS}" JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC" JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/dev/shm/rmq_srv_gc.log -XX:+PrintGCDetails" JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow" diff --git a/image-build/scripts/runbroker-customize.sh b/image-build/scripts/runbroker-customize.sh index e1edad0..7830054 100755 --- a/image-build/scripts/runbroker-customize.sh +++ b/image-build/scripts/runbroker-customize.sh @@ -50,93 +50,18 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH} #=========================================================================================== # JVM Configuration #=========================================================================================== -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m| sed -n '2p' | awk '{print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} -calculate_heap_sizes +# Set default JVM memory options if not provided +DEFAULT_HEAP_OPTS="-Xms2g -Xmx2g -Xmn1g -XX:MaxDirectMemorySize=1g" +HEAP_OPTS=${HEAP_OPTS:-$DEFAULT_HEAP_OPTS} -# Dynamically calculate parameters, for reference. -Xms=$MAX_HEAP_SIZE -Xmx=$MAX_HEAP_SIZE -Xmn=$HEAP_NEWSIZE -MaxDirectMemorySize=$MAX_HEAP_SIZE -# Set for `JAVA_OPT`. -JAVA_OPT="${JAVA_OPT} -server -Xms${Xms} -Xmx${Xmx} -Xmn${Xmn}" +# Setting JAVA options +JAVA_OPT="${JAVA_OPT} -server ${HEAP_OPTS}" JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8" JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/dev/shm/mq_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy" JAVA_OPT="${JAVA_OPT} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m" JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow" JAVA_OPT="${JAVA_OPT} -XX:+AlwaysPreTouch" -JAVA_OPT="${JAVA_OPT} -XX:MaxDirectMemorySize=${MaxDirectMemorySize}" JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages -XX:-UseBiasedLocking" JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${BASE_DIR}/lib" #JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n" diff --git a/image-build/scripts/runserver-customize.sh b/image-build/scripts/runserver-customize.sh index c05e77e..c950c63 100755 --- a/image-build/scripts/runserver-customize.sh +++ b/image-build/scripts/runserver-customize.sh @@ -50,86 +50,11 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH} #=========================================================================================== # JVM Configuration #=========================================================================================== -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m| sed -n '2p' | awk '{print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} - -calculate_heap_sizes +DEFAULT_HEAP_OPTS="-Xms1g -Xmx1g -Xmn512M" +HEAP_OPTS=${HEAP_OPTS:-$DEFAULT_HEAP_OPTS} -# Dynamically calculate parameters, for reference. -Xms=$MAX_HEAP_SIZE -Xmx=$MAX_HEAP_SIZE -Xmn=$HEAP_NEWSIZE # Set for `JAVA_OPT`. -JAVA_OPT="${JAVA_OPT} -server -Xms${Xms} -Xmx${Xmx} -Xmn${Xmn}" +JAVA_OPT="${JAVA_OPT} -server ${HEAP_OPTS}" JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC" JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/dev/shm/rmq_srv_gc.log -XX:+PrintGCDetails" JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow" diff --git a/rocketmq-k8s-helm/templates/broker/statefulset.yaml b/rocketmq-k8s-helm/templates/broker/statefulset.yaml index a62cdf5..144f19d 100644 --- a/rocketmq-k8s-helm/templates/broker/statefulset.yaml +++ b/rocketmq-k8s-helm/templates/broker/statefulset.yaml @@ -35,7 +35,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - - name: BROKER_MEM + - name: HEAP_OPTS value: {{ .Values.broker.jvmMemory }} - name: NAMESRV_ADDR value: {{ include "rocketmq-nameserver.fullname" . }}:9876 diff --git a/rocketmq-k8s-helm/templates/controller/statefulset.yaml b/rocketmq-k8s-helm/templates/controller/statefulset.yaml index c6c2271..4847f51 100644 --- a/rocketmq-k8s-helm/templates/controller/statefulset.yaml +++ b/rocketmq-k8s-helm/templates/controller/statefulset.yaml @@ -39,7 +39,7 @@ spec: {{- end }} containers: - name: controller - image: "{{ .Values.controller.image.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}" + image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}" imagePullPolicy: {{ .Values.controller.image.pullPolicy }} env: - name: NODE_ROLE diff --git a/rocketmq-k8s-helm/values.yaml b/rocketmq-k8s-helm/values.yaml index bf27e04..c1841da 100644 --- a/rocketmq-k8s-helm/values.yaml +++ b/rocketmq-k8s-helm/values.yaml @@ -192,10 +192,10 @@ broker: resources: limits: cpu: 2 - memory: 4Gi + memory: 6Gi requests: cpu: 2 - memory: 4Gi + memory: 6Gi nodeSelector: { } @@ -206,7 +206,6 @@ controller: fullnameOverride: "" replicas: 3 image: - registry: docker.io repository: "apache/rocketmq" tag: "latest" pullPolicy: IfNotPresent