Update aws-lambda-runtime-libs and adjustments for newer JDK (#3)

Author: AntonKozlov

Dockerfile.baseline

@@ -13,6 +13,7 @@ ENV AWS_XRAY_CONTEXT_MISSING=LOG_ERROR
 ENTRYPOINT [ "/jdk/bin/java", \
 	"-XX:-UsePerfData", \
 	"-cp", "/function:/function/lib/*", \
+	"--add-opens", "java.base/java.util=ALL-UNNAMED", \
 	"com.amazonaws.services.lambda.runtime.api.client.AWSLambda" ]
 
 # Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)

Dockerfile.checkpoint

@@ -1,41 +1,22 @@
-FROM ubuntu:18.04 as builder
-
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
-
-COPY jdk /jdk
-
-RUN LIBJVM=/jdk/lib/server/libjvm.so; \
-	       lz4 -f -z -9 $LIBJVM $LIBJVM.lz4; \
-	       rm -f $LIBJVM; \
-	       ln -s /tmp/sub/$LIBJVM $LIBJVM
-
-
 FROM ubuntu:18.04
 
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
-
-COPY --from=builder /jdk /jdk
-COPY prepare-jdk.cmd.sh /
+COPY jdk /jdk
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/classes /function
 COPY target/dependency/* /function/lib/
 
-RUN /prepare-jdk.cmd.sh ; \
-	cd /function/lib; /jdk/bin/jar -x -f aws-lambda-java-runtime-interface-client*.jar \
-		aws-lambda-runtime-interface-client.musl.so \
-		aws-lambda-runtime-interface-client.glibc.so
+RUN cd /function/lib; /jdk/bin/jar -x -f aws-lambda-java-runtime-interface-client*.jar \
+	jni/libaws-lambda-jni.linux_musl-x86_64.so \
+	jni/libaws-lambda-jni.linux-x86_64.so \
+	jni/libaws-lambda-jni.linux-aarch_64.so \
+	jni/libaws-lambda-jni.linux_musl-aarch_64.so
 
 WORKDIR /function
 
 ENV AWS_XRAY_CONTEXT_MISSING=LOG_ERROR
 
+COPY TryLoad.java /usr/local/lib/
 COPY checkpoint.cmd.sh /
 ENTRYPOINT [ "/bin/bash", "/checkpoint.cmd.sh" ]
 

Dockerfile.restore

@@ -1,19 +1,5 @@
-FROM ubuntu:18.04 as builder
-
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
-
-COPY cr /cr
-RUN tar -c /cr | lz4 -z -9 - /cr.tar.lz4
-
 FROM crac-lambda-checkpoint
 
-COPY --from=builder /cr.tar.lz4 /
-
-ADD restore.cmd.sh /
-ENTRYPOINT [ "/bin/bash", "/restore.cmd.sh" ]
+COPY cr /cr
 
-# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
-CMD [ "example.Handler::handleRequest" ]
+ENTRYPOINT [ "/jdk/bin/java", "-XX:CRaCRestoreFrom=/cr" ]

TryLoad.java

@@ -0,0 +1,16 @@
+
+public class TryLoad {
+    public static void main(String... args) { 
+        for (String path : args) {
+            System.err.printf("Trying %s ... ", path);
+            try {
+                System.load(path);
+                System.err.println("OK");
+                System.out.println(path);
+                break;
+            } catch (UnsatisfiedLinkError ignore) {
+                System.err.println("FAIL");
+            }
+        }
+    }
+}

checkpoint.cmd.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
 
-/prepare-jdk.cmd.sh
+detect_native_client() {
+	/jdk/bin/java -cp /function:/function/lib/* /usr/local/lib/TryLoad.java $@
+}
+
+export AWS_NATIVE_CLIENT=$(detect_native_client /function/lib/jni/libaws-lambda-jni.*.so)
+export CRAC_CRIU_OPTS="--compress"
 
 # Ensure small PID, for privileged-less criu to be able to restore PID by bumping.
 # But not too small, to avoid clashes with other occasional processes on restore.
-exec /aws-lambda-rie /bin/bash -c '\
-	while [ 128 -ge $(cat /proc/sys/kernel/ns_last_pid) ]; do :; done; \
-	setsid /jdk/bin/java \
+exec /aws-lambda-rie /jdk/bin/java \
 		-Xshare:off \
 		-XX:-UsePerfData \
+		-XX:CRaCMinPid=128 \
 		-XX:CRaCCheckpointTo=/cr \
 		-cp /function:/function/lib/* \
-		-Dcom.amazonaws.services.lambda.runtime.api.client.NativeClient.libsBase=/function/lib/ \
+		-Dcom.amazonaws.services.lambda.runtime.api.client.runtimeapi.NativeClient.JNI=$AWS_NATIVE_CLIENT \
 		--add-opens java.base/java.util=ALL-UNNAMED \
-		com.amazonaws.services.lambda.runtime.api.client.AWSLambda $0' "$@"
+		com.amazonaws.services.lambda.runtime.api.client.AWSLambda "$@"

crac-steps.sh

@@ -14,7 +14,9 @@ iolim() { IOLIM=$1; }
 dojlink() {
 	local JDK=$1
 	rm -rf jdk
-	$JDK/bin/jlink --bind-services --output jdk --module-path $JDK/jmods --add-modules java.base,jdk.unsupported,java.sql
+	MODS=java.base,jdk.unsupported,java.sql
+	[ -f $JDK/jmods/jdk.crac.jmod ] && MODS+=",jdk.crac"
+	$JDK/bin/jlink --bind-services --output jdk --module-path $JDK/jmods --add-modules $MODS
 	# XXX
 	cp $JDK/lib/criu jdk/lib/
 }
@@ -40,9 +42,11 @@ s01_build() {
 
 s02_start_checkpoint() {
 	docker run \
+		--ulimit nofile=1024 \
 		--privileged \
 		--rm \
 		--name crac-checkpoint \
+		-m 512m \
 		-v $PWD/aws-lambda-rie:/aws-lambda-rie \
 		-v $PWD/cr:/cr \
 		-p 8080:8080 \
@@ -97,11 +101,11 @@ local_test() {
 s05_local_restore() {
 	local_test \
 		crac-lambda-restore \
-		/aws-lambda-rie /bin/bash /restore.cmd.sh
+		/aws-lambda-rie /jdk/bin/java -XX:CRaCRestoreFrom=/cr
 }
 
 local_baseline() {
-	local_test crac-lambda-checkpoint \
+	local_test ${1:-crac-lambda-checkpoint} \
 		/aws-lambda-rie /jdk/bin/java \
 			-XX:-UsePerfData \
 			-cp /function:/function/lib/* \
@@ -116,7 +120,7 @@ ltest() {
 		-v /home:/home \
 		-v $PWD/logdir:/tmp/log \
 		crac-lambda-restore \
-		/bin/bash $PWD/restore.cmd.sh
+		$PWD/jdk/bin/java -XX:CRaCRestoreFrom=$PWD/cr
 }
 
 s06_init_aws() {
@@ -132,7 +136,7 @@ s06_init_aws() {
 }
 
 s07_deploy_aws() {
-        docker tag crac-lambda-restore $REMOTEIMG
+        docker tag ${1:-crac-lambda-restore} $REMOTEIMG
         docker push $REMOTEIMG
 
         local digest=$(docker inspect -f '{{ index .RepoDigests 0 }}' $REMOTEIMG)
@@ -156,10 +160,9 @@ s08_invoke_aws() {
 }
 
 make_cold_aws() {
-	local mem=$(aws lambda get-function-configuration --function-name $LAMBDA_NAME | jq -r '.MemorySize')
-	local min=256
-	local max=512
-	aws lambda update-function-configuration --function-name $LAMBDA_NAME --memory-size $(($min + (($mem + 1) % ($max - $min))))
+	aws lambda update-function-configuration --function-name $LAMBDA_NAME --memory-size 511
+	aws lambda wait function-updated --function-name $LAMBDA_NAME
+	aws lambda update-function-configuration --function-name $LAMBDA_NAME --memory-size 512
 	aws lambda wait function-updated --function-name $LAMBDA_NAME
 }
 
@@ -169,4 +172,8 @@ steps() {
 	done
 }
 
+okify() {
+	"$@" || true
+}
+
 "$@"

pom.xml

@@ -10,17 +10,18 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
   <dependencies>
     <dependency>
-      <groupId>io.github.crac.com.amazonaws</groupId>
-      <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-      <version>1.0.0</version>
+      <groupId>com.amazonaws.serverless</groupId>
+      <artifactId>aws-serverless-java-container-springboot2</artifactId>
+      <version>1.8</version>
     </dependency>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-lambda-java-core</artifactId>
-      <version>1.2.1</version>
+      <groupId>io.github.crac.com.amazonaws</groupId>
+      <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
+      <version>2.4.1.CRAC.0</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
@@ -52,6 +53,17 @@
       <artifactId>log4j-slf4j18-impl</artifactId>
       <version>[2.17.1,)</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>lambda</artifactId>

prepare-jdk.cmd.sh

@@ -1277,26 +1277,6 @@
 			"action": "SCMP_ACT_ALLOW",
 			"args": []
 		},
-		{
-			"name": "shmat",
-			"action": "SCMP_ACT_ALLOW",
-			"args": []
-		},
-		{
-			"name": "shmctl",
-			"action": "SCMP_ACT_ALLOW",
-			"args": []
-		},
-		{
-			"name": "shmdt",
-			"action": "SCMP_ACT_ALLOW",
-			"args": []
-		},
-		{
-			"name": "shmget",
-			"action": "SCMP_ACT_ALLOW",
-			"args": []
-		},
 		{
 			"name": "shutdown",
 			"action": "SCMP_ACT_ALLOW",