Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -511,11 +511,11 @@
 	 (staging-file (conc *toppath* "/.megatest.db"))
 	 (mtdbfile     (conc *toppath* "/megatest.db"))
 	 (lockfile     (common:get-sync-lock-filepath))
          (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
          (sync-cmd     (if fork-to-background 
-                           (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core"\"")
+                           (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
                            sync-cmd-core))
          (default-min-intersync-delay 2)
 	 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: default-min-intersync-delay))
          (default-duty-cycle 0.1)
          (duty-cycle   (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle))
@@ -580,11 +580,12 @@
                              (cond
                               (persist-until-sync
                                (thread-sleep! 1)
                                (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed.  Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)")
                                (retry-loop (add1 num-tries)))
-                             (else
+                              (else
+                               (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay)))
                                (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
                                'parallel-sync-in-progress))
                              ) ;; end if got lockfile
                          )
                     ))
@@ -595,11 +596,11 @@
     do-a-sync))
 
 (define (server:writable-watchdog dbstruct)
   (thread-sleep! 10) ;; delay for startup
   (let* ((do-a-sync  (server:get-bruteforce-syncer dbstruct))
-         (final-sync (server:get-bruteforce-syncer dbstruct persist-until-sync: #t)))
+         (final-sync (server:get-bruteforce-syncer dbstruct fork-to-background: #t persist-until-sync: #t)))
     (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
 	       (args:get-arg "-server"))
       
       (let loop ()
 	(do-a-sync)