Merge pull request #4492 from chu11/issue4267_content_backing_module_…

…none

etc: support content.backing-module=none

etc/rc1

@@ -11,11 +11,15 @@ modload() {
     fi
 }
 
+backing_module() {
+    local backingmod=$(flux getattr content.backing-module 2>/dev/null) || :
+    echo ${backingmod:-content-sqlite}
+}
+
 modload all barrier
 
 if test $RANK -eq 0; then
-    backingmod=$(flux getattr content.backing-module 2>/dev/null) || :
-    backingmod=${backingmod:-content-sqlite}
+    backingmod=$(backing_module)
     dumpfile=$(flux getattr content.restore 2>/dev/null) || :
     if test -n "${dumpfile}"; then
         if test "${dumpfile}" = "auto"; then
@@ -30,13 +34,15 @@ if test $RANK -eq 0; then
         fi
     fi
     if test -n "${dumpfile}"; then
-        flux module load ${backingmod} truncate
+        if test "${backingmod}" != "none"; then
+            flux module load ${backingmod} truncate
+        fi
         echo "restoring content from ${dumpfile}"
         flux restore --quiet --checkpoint ${dumpfile}
         if test -n "${dumplink}"; then
             rm -f ${dumplink}
         fi
-    else
+    elif test "${backingmod}" != "none"; then
         flux module load ${backingmod}
     fi
 fi
@@ -45,7 +51,9 @@ modload all kvs
 modload all kvs-watch
 
 if test $RANK -eq 0; then
-    flux startlog --post-start-event
+    if test "$(backing_module)" != "none"; then
+        flux startlog --post-start-event
+    fi
 fi
 
 modload all resource
@@ -58,9 +66,13 @@ if test $RANK -eq 0 -a -n "${period}"; then
     flux module load job-archive
 fi
 
-if test $RANK -eq 0 && ! flux startlog --check --quiet; then
-    flux queue stop
-    flux queue disable "Flux is in safe mode due to an incomplete shutdown."
+if test $RANK -eq 0; then
+    if test "$(backing_module)" != "none"; then
+        if ! flux startlog --check --quiet; then
+            flux queue stop
+            flux queue disable "Flux is in safe mode due to an incomplete shutdown."
+        fi
+    fi
 fi
 
 modload all job-ingest

etc/rc3

@@ -11,6 +11,11 @@ modrm() {
     fi
 }
 
+backing_module() {
+    local backingmod=$(flux getattr content.backing-module 2>/dev/null) || :
+    echo ${backingmod:-content-sqlite}
+}
+
 core_dir=$(cd ${0%/*} && pwd -P)
 all_dirs=$core_dir${FLUX_RC_EXTRA:+":$FLUX_RC_EXTRA"}
 IFS=:
@@ -37,17 +42,20 @@ modrm 0 cron
 modrm all barrier
 
 if test $RANK -eq 0; then
-    flux startlog --post-finish-event || exit_rc=1
+    if test "$(backing_module)" != "none"; then
+        flux startlog --post-finish-event || exit_rc=1
+    fi
 fi
 
 modrm all kvs-watch
 modrm all kvs
 
-flux content flush || exit_rc=1
+if test "$(backing_module)" != "none"; then
+    flux content flush || exit_rc=1
+fi
 
 if test $RANK -eq 0; then
-    backingmod=$(flux getattr content.backing-module 2>/dev/null)
-    backingmod=${backingmod:-content-sqlite}
+    backingmod=$(backing_module)
     dumpfile=$(flux getattr content.dump 2>/dev/null)
     if test $exit_rc -eq 0 -a -n "${dumpfile}"; then
         if test "${dumpfile}" = "auto"; then
@@ -63,7 +71,9 @@ if test $RANK -eq 0; then
             exit_rc=1
         fi
     fi
-    flux module remove ${backingmod} || exit_rc=1
+    if test "${backingmod}" != "none"; then
+        flux module remove ${backingmod} || exit_rc=1
+    fi
 fi
 
 exit $exit_rc

src/broker/content-cache.c

@@ -692,6 +692,7 @@ static void content_register_backing_request (flux_t *h,
     if (flux_respond (h, msg, NULL) < 0)
         flux_log_error (h, "error responding to register-backing request");
     (void)cache_flush (cache);
+    (void)checkpoints_flush (cache->checkpoint);
     return;
 error:
     if (flux_respond_error (h, msg, errno, errstr) < 0)