Test shm checkpointing. Relies on shm checkpointing implementation in mod_pagespeed. (#930)
diff --git a/test/nginx_system_test.sh b/test/nginx_system_test.sh
index 3433af8..860583a 100644
--- a/test/nginx_system_test.sh
+++ b/test/nginx_system_test.sh
@@ -622,15 +622,17 @@
check wget $EXAMPLE_ROOT/styles/W.rewrite_css_images.css.pagespeed.cf.Hash.css \
-O /dev/null
check_simple "$NGINX_EXECUTABLE" -s reload -c "$PAGESPEED_CONF"
+
# Wait for the new worker process with the new configuration to get ready, or
# else the sudden reset of the shared mem statistics/cache might catch upcoming
# tests unaware.
-while [ $(scrape_stat image_rewrite_total_original_bytes) -gt 0 ]
-do
+function wait_for_new_worker() {
+ while [ $(scrape_stat image_rewrite_total_original_bytes) -gt 0 ]; do
echo "Waiting for new worker to get ready..."
sleep .1
-done
-
+ done
+}
+wait_for_new_worker
check wget $EXAMPLE_ROOT/styles/W.rewrite_css_images.css.pagespeed.cf.Hash.css \
-O /dev/null
if [ "$AB_PID" != "0" ]; then
@@ -646,6 +648,40 @@
check grep "Root process is starting a new controller; shutting down." \
$ERROR_LOG
+start_test "Shared memory checkpointing"
+
+# We do two tests here:
+# 1. Metadata cache: check that an IPRO'd image is still fully optimized after a
+# restart.
+# 2. Property cache: prioritize critical CSS persists beacon results across
+# restarts.
+
+IPRO_URL="$EXAMPLE_ROOT/images/Cuppa.png"
+
+# Checkpoint beacon results to disk if we haven't already.
+check wget "$IPRO_URL" -O /dev/null
+test_prioritize_critical_css
+sleep 2
+check wget "$IPRO_URL" -O /dev/null
+test_prioritize_critical_css
+
+# Reload nginx again.
+check_simple "$NGINX_EXECUTABLE" -s reload -c "$PAGESPEED_CONF"
+wait_for_new_worker
+
+# The image should be fully optimized.
+OUT=$($CURL -sS -D- -o/dev/null "$IPRO_URL")
+check_from "$OUT" grep ^X-Original-Content-Length:
+check_from "$OUT" grep ^Content-Length:
+content_length=$(echo "$OUT" | grep ^Content-Length: | grep -o [0-9]*)
+original_content_length=$(echo "$OUT" | grep ^X-Original-Content-Length: \
+ | grep -o [0-9]*)
+check [ "$original_content_length" -gt "$content_length" ]
+
+# The beacon responses are stored in the metadata cache, so this can only pass
+# if we persisted the metadata across restarts.
+test_prioritize_critical_css_final
+
# This is dependent upon having a beacon handler.
test_filter add_instrumentation beacons load.
diff --git a/test/pagespeed_test.conf.template b/test/pagespeed_test.conf.template
index e1e4b8d..3618ac5 100644
--- a/test/pagespeed_test.conf.template
+++ b/test/pagespeed_test.conf.template
@@ -63,6 +63,12 @@
pagespeed CreateSharedMemoryMetadataCache "@@SHM_CACHE@@" 8192;
pagespeed BlockingRewriteKey psatest;
+ # We need to checkpoint more frequently than usual so that our checkpointing
+ # test will definitly have seen one of these intervals and so not be flaky.
+ # This needs to have a 1s interval because the checkpointing test has a 2s
+ # sleep.
+ pagespeed ShmMetadataCacheCheckpointIntervalSec 1;
+
# CriticalImagesBeaconEnabled is now on by default, but we disable in testing.
# With this option enabled, the inline image system test will currently fail.
# When critical image beaconing is enabled, only critical images are inlined.
