Skip to content

Commit 4f946d5

Browse files
committed
1. rename submodule to polardbx-glue
2. optimize startup.sh jvm args 3. optimize entrypoint.sh
1 parent 55ca0c9 commit 4f946d5

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

Diff for: .gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "polardbx-rpc"]
22
path = polardbx-rpc
3-
url = https://github.com/ApsaraDB/galaxyglue.git
3+
url = https://github.com/polardb/polardbx-glue.git

Diff for: docker/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
GALAXYSQL_HOME=/home/admin/drds-server
1818

1919
function galaxysql_pid() {
20-
jps | grep Tddl | cut -d ' ' -f 1
20+
ps auxf | grep java | grep TddlLauncher | awk '{print $2}'
2121
}
2222

2323
function kill_and_clean() {

Diff for: polardbx-server/src/main/bin/startup.sh

+19-15
Original file line numberDiff line numberDiff line change
@@ -398,22 +398,26 @@ if [ -n "$str" ]; then
398398
freecount=`expr $memory / 1024 / 1024`
399399
fi
400400

401-
if [ $freecount -lt 2048 ] ; then
402-
JAVA_OPTS="-server -Xms1024m -Xmx1024m "
403-
elif [ $freecount -le 4096 ] ; then
404-
JAVA_OPTS="-server -Xms2g -Xmx2g "
405-
elif [ $freecount -le 8192 ] ; then
406-
JAVA_OPTS="-server -Xms4g -Xmx4g "
407-
elif [ $freecount -le 16384 ] ; then
408-
JAVA_OPTS="-server -Xms10g -Xmx10g -XX:MaxDirectMemorySize=3g"
409-
elif [ $freecount -le 32768 ] ; then
410-
JAVA_OPTS="-server -Xms24g -Xmx24g -XX:MaxDirectMemorySize=6g"
411-
elif [ $freecount -le 65536 ] ; then
412-
JAVA_OPTS="-server -Xms50g -Xmx50g -XX:MaxDirectMemorySize=12g"
413-
elif [ $freecount -le 131072 ] ; then
401+
if [ $freecount -ge 131072 ] ; then
414402
JAVA_OPTS="-server -Xms110g -Xmx110g -XX:MaxDirectMemorySize=24g"
415-
elif [ $freecount -gt 131072 ] ; then
416-
JAVA_OPTS="-server -Xms120g -Xmx120g -XX:MaxDirectMemorySize=32g"
403+
elif [ $freecount -ge 65536 ] ; then
404+
JAVA_OPTS="-server -Xms50g -Xmx50g -XX:MaxDirectMemorySize=12g"
405+
elif [ $freecount -ge 32768 ] ; then
406+
JAVA_OPTS="-server -Xms24g -Xmx24g -XX:MaxDirectMemorySize=6g"
407+
elif [ $freecount -ge 16384 ] ; then
408+
JAVA_OPTS="-server -Xms10g -Xmx10g -XX:MaxDirectMemorySize=3g"
409+
elif [ $freecount -ge 8192 ] ; then
410+
JAVA_OPTS="-server -Xms4g -Xmx4g "
411+
elif [ $freecount -ge 4096 ] ; then
412+
JAVA_OPTS="-server -Xms2g -Xmx2g "
413+
elif [ $freecount -ge 2048 ] ; then
414+
JAVA_OPTS="-server -Xms1024m -Xmx1024m "
415+
elif [ $freecount -ge 1024 ] ; then
416+
JAVA_OPTS="-server -Xms512m -Xmx512m "
417+
elif [ $freecount -ge 512 ] ; then
418+
JAVA_OPTS="-server -Xms256m -Xmx256m "
419+
elif [ $freecount -ge 256 ] ; then
420+
JAVA_OPTS="-server -Xms128m -Xmx128m "
417421
fi
418422
else
419423
echo "not support 32-bit java startup"

0 commit comments

Comments
 (0)