[inlong] branch master updated: [INLONG-8146][Agent] Add -XX:NativeMemoryTracking in agent-env.sh (#8147)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new c94f01890c [INLONG-8146][Agent] Add -XX:NativeMemoryTracking in 
agent-env.sh (#8147)
c94f01890c is described below

commit c94f01890c7b96a2ee298abd69b4ea3e2d7acbb4
Author: kipshi <48468934+kip...@users.noreply.github.com>
AuthorDate: Thu Jul 13 09:50:24 2023 +0800

    [INLONG-8146][Agent] Add -XX:NativeMemoryTracking in agent-env.sh (#8147)
    
    Co-authored-by: kipshi <kip...@tencent.com>
---
 inlong-agent/agent-docker/Dockerfile | 1 +
 inlong-agent/bin/agent-env.sh        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/inlong-agent/agent-docker/Dockerfile 
b/inlong-agent/agent-docker/Dockerfile
index a1c7367022..bc4b777bcf 100644
--- a/inlong-agent/agent-docker/Dockerfile
+++ b/inlong-agent/agent-docker/Dockerfile
@@ -41,6 +41,7 @@ ENV AGENT_HEARTBEAT_INTERVAL=10
 ENV CLUSTER_NAME=default_agent
 ENV CLUSTER_TAG=default_cluster
 ENV CLUSTER_IN_CHARGES=admin
+ENV NEED_TRACK_NATIVE_MEMORY=false
 ENV AGENT_JVM_HEAP_OPTS="-XX:+UseContainerSupport 
-XX:InitialRAMPercentage=40.0 -XX:MaxRAMPercentage=80.0 
-XX:-UseAdaptiveSizePolicy"
 ADD agent-docker.sh bin/
 RUN chmod +x bin/agent-docker.sh
diff --git a/inlong-agent/bin/agent-env.sh b/inlong-agent/bin/agent-env.sh
index c0dade5bc5..98718573c7 100755
--- a/inlong-agent/bin/agent-env.sh
+++ b/inlong-agent/bin/agent-env.sh
@@ -42,6 +42,9 @@ else
   HEAP_OPTS="$AGENT_JVM_HEAP_OPTS"
 fi
 GC_OPTS="-XX:SurvivorRatio=6 -XX:+UseMembar -XX:+UseConcMarkSweepGC 
-XX:+CMSParallelRemarkEnabled -XX:+CMSScavengeBeforeRemark 
-XX:ParallelCMSThreads=3 -XX:+TieredCompilation 
-XX:+UseCMSCompactAtFullCollection -verbose:gc -Xloggc:$BASE_DIR/logs/gc.log 
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=$BASE_DIR/logs/ -XX:+CMSClassUnloadingEnabled 
-XX:CMSInitiatingOccupancyFraction=60 -XX:CMSFullGCsBeforeCompaction=1 
-Dsun.net.inetaddr.ttl=3 -Dsun. [...]
+if [ -n "$NEED_TRACK_NATIVE_MEMORY" ] && [ "$NEED_TRACK_NATIVE_MEMORY" = 
"true" ]; then
+    GC_OPTS="$GC_OPTS -XX:NativeMemoryTracking"
+fi
 AGENT_JVM_ARGS="$HEAP_OPTS $GC_OPTS"
 
 # Add Agent Rmi Args when necessary