From b89fa9dd5c3f325729e06e7cd89c4ccc353820ce Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Wed, 17 May 2023 14:47:18 +0800
Subject: [PATCH] [demos] Update sofaboot demo with glibc openjdk 8

---
 demos/sofaboot/README.md                      | 4 ++--
 demos/sofaboot/download_compile_sofaboot.sh   | 2 ++
 demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh | 9 ++++++---
 demos/sofaboot/sofaboot_jdk8.yaml             | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/demos/sofaboot/README.md b/demos/sofaboot/README.md
index 28bdd886..e5b5a615 100644
--- a/demos/sofaboot/README.md
+++ b/demos/sofaboot/README.md
@@ -17,12 +17,12 @@ This project demonstrates how to execute an unmodified sofaboot projects with Oc
 
 2. Run `sofaboot sample standard web` on Occlum
 
-* Run with openjdk 8
+* Run with openjdk 8 glibc version
 ```
 ./run_sofaboot_on_occlum_jdk8.sh
 ```
 
-* Run with openjdk 11
+* Run with openjdk 11 musl-libc version
 ```
 ./run_sofaboot_on_occlum.sh
 ```
diff --git a/demos/sofaboot/download_compile_sofaboot.sh b/demos/sofaboot/download_compile_sofaboot.sh
index 78da7234..df8509b2 100755
--- a/demos/sofaboot/download_compile_sofaboot.sh
+++ b/demos/sofaboot/download_compile_sofaboot.sh
@@ -5,11 +5,13 @@ if [[ $1 == "jdk8" ]]; then
     echo ""
     echo "*** Build sofaboot demo with openjdk 8 ***"
     echo "*** Make sure openjdk 8 is installed ***"
+    echo " For example on Ubuntu 20.04, apt install -y openjdk-8-jdk"
     mvn -v | grep "java-8"
 else
     echo ""
     echo "*** Build sofaboot demo with openjdk 11 ***"
     echo "*** Make sure openjdk 11 is installed ***"
+    echo " For example on Ubuntu 20.04, apt install -y openjdk-11-jdk"
     mvn -v | grep "java-11"
 fi
 
diff --git a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh
index e2aae975..9b96c2a9 100755
--- a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh
+++ b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh
@@ -21,8 +21,8 @@ init_instance() {
                 .resource_limits.kernel_space_heap_size="64MB" |
                 .resource_limits.max_num_of_threads = 64 |
                 .process.default_heap_size = "256MB" |
-                .entry_points = [ "/usr/lib/jvm/java-1.8-openjdk/jre/bin" ] |
-                .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-1.8-openjdk/jre/lib:/usr/lib/jvm/java-1.8-openjdk/lib" ]' Occlum.json)" && \
+                .entry_points = [ "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/" ] |
+                .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/lib:/usr/lib/jvm/java-8-openjdk-amd64/lib" ]' Occlum.json)" && \
     echo "${new_json}" > Occlum.json
 }
 
@@ -40,7 +40,10 @@ run_sofa() {
     init_instance
     build_sofa
     echo -e "${BLUE}occlum run SOFABoot demo${NC}"
-    occlum run /usr/lib/jvm/java-1.8-openjdk/jre/bin/java -Xmx512m -XX:-UseCompressedOops -XX:MaxMetaspaceSize=64m -Dos.name=Linux -jar /usr/lib/spring/${jar_file} &
+    occlum run /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
+        -XX:-UseCompressedOops \
+        -XX:ActiveProcessorCount=4 \
+        -Dos.name=Linux -jar /usr/lib/spring/${jar_file} &
 }
 
 run_sofa
diff --git a/demos/sofaboot/sofaboot_jdk8.yaml b/demos/sofaboot/sofaboot_jdk8.yaml
index 37ee2179..53732a14 100644
--- a/demos/sofaboot/sofaboot_jdk8.yaml
+++ b/demos/sofaboot/sofaboot_jdk8.yaml
@@ -1,6 +1,6 @@
 includes: 
   - base.yaml
-  - java-8-openjdk.yaml
+  - java-8-openjdk-amd64.yaml
 targets: 
   # copy sofaboot jar
   - target: /usr/lib/spring