Skip to content

Commit ae9f8eb

Browse files
qijiale76EnricoMi
authored andcommittedMay 28, 2024
[apache#1149] fix: GC logs in JDK 11 do not include date and time stamps. (apache#1240)
### What changes were proposed in this pull request? Fix GC logs in JDK 11 do not include date and time stamps ### Why are the changes needed? Fix: apache#1149 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Manually tested
1 parent eaa7af4 commit ae9f8eb

File tree

3 files changed

+73
-21
lines changed

3 files changed

+73
-21
lines changed
 

‎bin/start-coordinator.sh

+20-5
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,28 @@ JVM_ARGS=" -server \
6868
-XX:ParallelGCThreads=20 \
6969
-XX:ConcGCThreads=5 \
7070
-XX:InitiatingHeapOccupancyPercent=45 \
71-
-XX:+PrintGC \
71+
-XX:+PrintCommandLineFlags"
72+
73+
GC_LOG_ARGS_LEGACY=" -XX:+PrintGC \
7274
-XX:+PrintAdaptiveSizePolicy \
7375
-XX:+PrintGCDateStamps \
7476
-XX:+PrintGCTimeStamps \
7577
-XX:+PrintTenuringDistribution \
7678
-XX:+PrintPromotionFailure \
7779
-XX:+PrintGCApplicationStoppedTime \
78-
-XX:+PrintCommandLineFlags \
7980
-XX:+PrintGCCause \
8081
-XX:+PrintGCDetails \
8182
-Xloggc:${RSS_LOG_DIR}/gc-%t.log"
8283

83-
JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \
84-
-Xlog:gc:tags,time,uptime,level"
84+
GC_LOG_ARGS_NEW=" -XX:+IgnoreUnrecognizedVMOptions \
85+
-Xlog:gc* \
86+
-Xlog:gc+age=trace \
87+
-Xlog:gc+heap=debug \
88+
-Xlog:gc+promotion=trace \
89+
-Xlog:gc+phases=debug \
90+
-Xlog:gc+ref=debug \
91+
-Xlog:gc+start=debug \
92+
-Xlog:gc*:file=${RSS_LOG_DIR}/gc-%t.log:tags,uptime,time,level"
8593

8694
ARGS=""
8795

@@ -92,7 +100,14 @@ else
92100
exit 1
93101
fi
94102

95-
$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ &
103+
version=$($RUNNER -version 2>&1 | awk -F[\".] '/version/ {print $2}')
104+
if [[ "$version" -lt "9" ]]; then
105+
GC_ARGS=$GC_LOG_ARGS_LEGACY
106+
else
107+
GC_ARGS=$GC_LOG_ARGS_NEW
108+
fi
109+
110+
$RUNNER $ARGS $JVM_ARGS $GC_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ &
96111

97112
get_pid_file_name coordinator
98113
echo $! >${RSS_PID_DIR}/${pid_file}

‎bin/start-shuffle-server.sh

+22-7
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,30 @@ JVM_ARGS=" -server \
103103
-XX:G1HeapRegionSize=32m \
104104
-XX:+UnlockExperimentalVMOptions \
105105
-XX:G1NewSizePercent=10 \
106-
-XX:+PrintGC \
106+
-XX:+CrashOnOutOfMemoryError \
107+
-XX:+ExitOnOutOfMemoryError \
108+
-XX:+PrintCommandLineFlags"
109+
110+
GC_LOG_ARGS_LEGACY=" -XX:+PrintGC \
107111
-XX:+PrintAdaptiveSizePolicy \
108112
-XX:+PrintGCDateStamps \
109113
-XX:+PrintGCTimeStamps \
110-
-XX:+CrashOnOutOfMemoryError \
111-
-XX:+ExitOnOutOfMemoryError \
112114
-XX:+PrintTenuringDistribution \
113115
-XX:+PrintPromotionFailure \
114116
-XX:+PrintGCApplicationStoppedTime \
115-
-XX:+PrintCommandLineFlags \
116117
-XX:+PrintGCCause \
117118
-XX:+PrintGCDetails \
118119
-Xloggc:${RSS_LOG_DIR}/gc-%t.log"
119120

120-
JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \
121-
-Xlog:gc:tags,time,uptime,level"
121+
GC_LOG_ARGS_NEW=" -XX:+IgnoreUnrecognizedVMOptions \
122+
-Xlog:gc* \
123+
-Xlog:gc+age=trace \
124+
-Xlog:gc+heap=debug \
125+
-Xlog:gc+promotion=trace \
126+
-Xlog:gc+phases=debug \
127+
-Xlog:gc+ref=debug \
128+
-Xlog:gc+start=debug \
129+
-Xlog:gc*:file=${RSS_LOG_DIR}/gc-%t.log:tags,uptime,time,level"
122130

123131
ARGS=""
124132

@@ -129,7 +137,14 @@ else
129137
exit 1
130138
fi
131139

132-
$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS $JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@ &
140+
version=$($RUNNER -version 2>&1 | awk -F[\".] '/version/ {print $2}')
141+
if [[ "$version" -lt "9" ]]; then
142+
GC_ARGS=$GC_LOG_ARGS_LEGACY
143+
else
144+
GC_ARGS=$GC_LOG_ARGS_NEW
145+
fi
146+
147+
$RUNNER $ARGS $JVM_ARGS $GC_ARGS $JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@ &
133148

134149
get_pid_file_name shuffle-server
135150
echo $! >${RSS_PID_DIR}/${pid_file}

‎bin/uniffle

+31-9
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,27 @@ function uniffle_cmd_case
6060
-XX:InitiatingHeapOccupancyPercent=20 \
6161
-XX:G1HeapRegionSize=32m \
6262
-XX:+UnlockExperimentalVMOptions \
63-
-XX:G1NewSizePercent=10 \
64-
-XX:+PrintGC \
63+
-XX:G1NewSizePercent=10"
64+
65+
GC_LOG_ARGS_LEGACY=" -XX:+PrintGC \
6566
-XX:+PrintAdaptiveSizePolicy \
6667
-XX:+PrintGCDateStamps \
6768
-XX:+PrintGCTimeStamps \
6869
-XX:+PrintGCDetails \
6970
-Xloggc:${RSS_LOG_DIR}/gc-%t.log"
7071

71-
JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \
72-
-Xlog:gc:tags,time,uptime,level"
72+
GC_LOG_ARGS_NEW=" -XX:+IgnoreUnrecognizedVMOptions \
73+
-Xlog:gc* \
74+
-Xlog:gc+heap=debug \
75+
-Xlog:gc:file=${RSS_LOG_DIR}/gc-%t.log:tags,uptime,time,level"
76+
77+
version=$(${JAVA} -version 2>&1 | awk -F[\".] '/version/ {print $2}')
78+
if [[ "$version" -lt "9" ]]; then
79+
GC_ARGS=$GC_LOG_ARGS_LEGACY
80+
else
81+
GC_ARGS=$GC_LOG_ARGS_NEW
82+
fi
83+
7384
UNIFFLE_OPTS="$UNIFFLE_OPTS $JVM_ARGS $JAVA11_EXTRA_ARGS"
7485

7586
UNIFFLE_SUBCMD_SUPPORT_DAEMONIZATION="true"
@@ -85,17 +96,28 @@ function uniffle_cmd_case
8596
-XX:MaxGCPauseMillis=200 \
8697
-XX:ParallelGCThreads=20 \
8798
-XX:ConcGCThreads=5 \
88-
-XX:InitiatingHeapOccupancyPercent=45 \
89-
-XX:+PrintGC \
99+
-XX:InitiatingHeapOccupancyPercent=45”
100+
101+
GC_LOG_ARGS_LEGACY=" -XX:+PrintGC \
90102
-XX:+PrintAdaptiveSizePolicy \
91103
-XX:+PrintGCDateStamps \
92104
-XX:+PrintGCTimeStamps \
93105
-XX:+PrintGCDetails \
94106
-Xloggc:${RSS_LOG_DIR}/gc-%t.log"
95107
96-
JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \
97-
-Xlog:gc:tags,time,uptime,level"
98-
UNIFFLE_OPTS="$UNIFFLE_OPTS $JVM_ARGS $JAVA11_EXTRA_ARGS"
108+
GC_LOG_ARGS_NEW=" -XX:+IgnoreUnrecognizedVMOptions \
109+
-Xlog:gc* \
110+
-Xlog:gc+heap=debug \
111+
-Xlog:gc:file=${RSS_LOG_DIR}/gc-%t.log:tags,uptime,time,level"
112+
113+
version=$(${JAVA} -version 2>&1 | awk -F[\".] '/version/ {print $2}')
114+
if [[ "$version" -lt "9" ]]; then
115+
GC_ARGS=$GC_LOG_ARGS_LEGACY
116+
else
117+
GC_ARGS=$GC_LOG_ARGS_NEW
118+
fi
119+
120+
UNIFFLE_OPTS="$UNIFFLE_OPTS $JVM_ARGS $GC_ARGS"
99121
100122
UNIFFLE_SUBCMD_SUPPORT_DAEMONIZATION="true"
101123
RSS_CONF_FILE="${RSS_CONF_DIR}/coordinator.conf"

0 commit comments

Comments
 (0)