aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-10-12 15:57:56 -0400
committerDan Timoney <dtimoney@att.com>2020-10-13 10:05:30 -0400
commit6572f12bd3fbff08be6e455d008bbc8a524e6f7f (patch)
tree998a1ab77113e6eac1970ada77b0b4630a642204
parenteff1c9cd4bf1b32bd44d664daef8318befb21a67 (diff)
[SDNC] Fix typo in setenv script
The setenv script used to set garbage collection options in Frankfurt contains a typo. Unfortunately, since the GC logging options are different in Frankfurt vs Guilin, we cannot simply cherry pick the Guilin change that fixed this - we must submit a separate change directly to Frankfurt. This change changes the setenv script so that it will be identical to that used in Guilin - the differences are now in sdnc values.yaml. There is a new setting (gcLogOptions), which is set here to the proper values to enable GC logging for Frankfurt. Issue-ID: SDNC-1377 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ibacdb598cc561d64d1e197d45fe485a4701e3dd8
-rw-r--r--kubernetes/sdnc/resources/config/conf/setenv11
-rw-r--r--kubernetes/sdnc/values.yaml1
2 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/sdnc/resources/config/conf/setenv b/kubernetes/sdnc/resources/config/conf/setenv
index 7476e6849a..3f4ce228ba 100644
--- a/kubernetes/sdnc/resources/config/conf/setenv
+++ b/kubernetes/sdnc/resources/config/conf/setenv
@@ -53,9 +53,8 @@
if [ "x$JAVA_MAX_MEM" = "x" ]; then
export JAVA_MAX_MEM="2048m"
fi
-
-EXTRA_JAVA_OPTS: "-XX:+UseG1GC -XX:MaxGCPauseMillis={{.Values.config.odl.javaOptions.maxGCPauseMillis}} \
- -XX:ParallelGCThreads={{.Values.config.odl.javaOptions.parallelGCThreads}} -XX:+ParallelRefProcEnabled \
- -XX:+UseStringDeduplication -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails \
- -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation \
- -XX:NumberOfGCLogFiles={{.Values.config.odl.javaOptions.numberGGLogFiles}} -Xloggc:/var/log/onap/sdnc/gc-%t.log"
+EXTRA_JAVA_OPTS=${EXTRA_JAVA_OPTS:-"-XX:+UseG1GC \
+ -XX:MaxGCPauseMillis={{.Values.config.odl.javaOptions.maxGCPauseMillis}} \
+ -XX:ParallelGCThreads={{.Values.config.odl.javaOptions.parallelGCThreads}} \
+ -XX:+ParallelRefProcEnabled \
+ -XX:+UseStringDeduplication {{.Values.config.odl.javaOptions.gcLogOptions}}"}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index f16f3b1925..2ca7ff4f5a 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -186,6 +186,7 @@ config:
maxGCPauseMillis: 100
parallelGCThreads : 3
numberGGLogFiles: 10
+ gcLogOptions: "-XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -Xloggc:/var/log/onap/sdnc/gc-%t.log"
# dependency / sub-chart configuration
certInitializer: