[feat][dingo-dist] Embed JDK 17 into Dingo

Author: wt0530

dingo-dist/bin/start-executor.sh

@@ -20,9 +20,17 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 JAR_PATH=$(find $ROOT -name dingo-executor-*.jar)
 LOCAL_STORE_JAR_PATH=$(find $ROOT -name dingo-store-local*.jar)
 NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
+APP_HOME=$( cd "$( dirname "$0" )/.." && pwd )
+PLATFORM=$(uname -s)-$(uname -m | sed 's/x86_64/x64/')
 JAVA_OPTS="-Xms8g -Xmx8g -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError -XX:MaxDirectMemorySize=4096m"
 
-nohup java ${JAVA_OPTS} \
+EMBEDDED_JDK="${APP_HOME}/${PLATFORM}"
+if [ -d "${EMBEDDED_JDK}" ]; then
+    export JAVA_HOME="${EMBEDDED_JDK}"
+    PATH="${JAVA_HOME}/bin:${PATH}"
+fi
+
+nohup ${JAVA_HOME}/bin/java ${JAVA_OPTS} \
      -Dlogback.configurationFile=file:${ROOT}/conf/logback-executor.xml \
      -classpath ${JAR_PATH}:${NET_JAR_PATH}:${LOCAL_STORE_JAR_PATH}  \
      io.dingodb.server.executor.Starter \

dingo-dist/bin/start-web.sh

@@ -18,9 +18,17 @@
 
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 JAR_PATH=$(find $ROOT -name dingo-web*.jar)
+APP_HOME=$( cd "$( dirname "$0" )/.." && pwd )
+PLATFORM=$(uname -s)-$(uname -m | sed 's/x86_64/x64/')
 JAVA_OPTS="-Xms1g -Xmx1g -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError"
 
-nohup java ${JAVA_OPTS} \
+EMBEDDED_JDK="${APP_HOME}/${PLATFORM}"
+if [ -d "${EMBEDDED_JDK}" ]; then
+    export JAVA_HOME="${EMBEDDED_JDK}"
+    PATH="${JAVA_HOME}/bin:${PATH}"
+fi
+
+nohup ${JAVA_HOME}/bin/java ${JAVA_OPTS} \
      -Dlogback.configurationFile=file:${ROOT}/conf/logback-web.xml \
      -jar ${JAR_PATH} \
      --spring.config.location=${ROOT}/conf/application-web.yaml \

dingo-dist/build.gradle

@@ -16,6 +16,72 @@
 
 plugins {
     id 'distribution'
+    id 'de.undercouch.download' version '5.4.0'
+}
+
+def jdkConfig = [
+    'Linux-x64' : [
+        url : 'https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz',
+        dir : 'jdk-17.0.2+7'
+    ],
+    'Windows-x64' : [
+        url : 'https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_windows-x64_bin.zip',
+        dir : 'jdk-17.0.2+7'
+    ],
+    'Darwin-x64' : [
+        url : 'https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_macos-x64_bin.tar.gz',
+        dir : 'jdk-17.0.2+7/Contents/Home'
+    ]
+]
+
+def down = project.hasProperty('isDownload') ? project.property('isDownload').toBoolean() : false
+
+tasks.register('downloadJdk') {
+    if (!down) {
+        return
+    }
+    doLast {
+        jdkConfig.each { platform, config ->
+            def destFile = file("${buildDir}/jdk/${platform}.${config.url.split(/\./).last()}")
+            def outputDir = file("${buildDir}/jdk/${platform}")
+
+            download.run {
+                src config.url
+                dest destFile
+                overwrite false
+            }
+
+            destFile.setReadable(true, false)
+            destFile.setWritable(true)
+
+            mkdir(outputDir)
+            outputDir.setWritable(true, false)
+
+            if (destFile.name.endsWith('.gz')) {
+                copy {
+                    from tarTree(resources.gzip(destFile))
+                    into outputDir
+                    eachFile { fcd ->
+                        fcd.path = fcd.path.replaceFirst(/^[^\/]+\//, '')
+                    }
+                    includeEmptyDirs = false
+                }
+            } else if (destFile.name.endsWith('.zip')) {
+                copy {
+                    from zipTree(destFile)
+                    into outputDir
+                    eachFile { fcd ->
+                        fcd.path = fcd.path.replaceFirst(/^[^\/]+\//, '')
+                    }
+                    includeEmptyDirs = false
+                }
+            }
+            fileTree(outputDir).each { file ->
+                file.setReadable(true, false)
+                file.setExecutable(true, false)
+            }
+        }
+    }
 }
 
 task copyDepends(type: Copy) {
@@ -26,6 +92,13 @@ task copyDepends(type: Copy) {
     }
     into layout.projectDirectory.dir("dingo")
 
+    from(fileTree("${buildDir}/jdk")) {
+        include('*-x64/**')
+        exclude('*.gz')
+        exclude('*.zip')
+    }
+    into layout.projectDirectory.dir("dingo")
+
     from(project(':dingo-executor').layout.buildDirectory) {
         include('libs/dingo-executor-*-all.jar')
     }
@@ -70,7 +143,7 @@ task copyDepends(type: Copy) {
 }
 
 tasks.register('packageDistribution', Zip) {
-    dependsOn(copyDepends)
+    dependsOn(copyDepends, downloadJdk)
     archiveFileName = "dingo.zip"
     destinationDirectory = layout.buildDirectory.dir('distributions')
     from layout.projectDirectory.dir("dingo")