Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -134,11 +134,13 @@
 		(sqlite3:set-busy-handler! db handler)
 		(sqlite3:execute db "PRAGMA synchronous = 0;")))
 	  (dbr:dbstruct-set-runvec-val! dbstruct run-id 'rundb db)
 	  (dbr:dbstruct-set-runvec-val! dbstruct run-id 'inuse #t)
 	  (if local
-	      db
+	      (begin
+		(dbr:dbstruct-set-runvec-val! dbstruct run-id 'inmem db) ;; direct access ...
+		db)
 	      (begin
 		(dbr:dbstruct-set-runvec-val! dbstruct run-id 'inmem inmem)
 		(db:sync-tables db:sync-tests-only db inmem)
 		inmem))))))
 
@@ -865,43 +867,44 @@
 ;;
 ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
 ;; runpatts: patt1,patt2 ...
 ;;
 (define (db:get-runs dbstruct runpatt count offset keypatts)
-  (let* ((db         (db:get-db dbstruct #f))
-	 (res       '())
+  (let* ((res       '())
 	 (keys       (db:get-keys dbstruct))
 	 (runpattstr (db:patt->like "runname" runpatt))
 	 (remfields  (list "id" "runname" "state" "status" "owner" "event_time"))
 	 (header     (append keys remfields))
 	 (keystr     (conc (keys->keystr keys) ","
-		           (string-intersperse remfields ",")))
+			   (string-intersperse remfields ",")))
 	 (qrystr     (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
-		           ;; Generate: " AND x LIKE 'keypatt' ..."
-		           (if (null? keypatts) ""
-		               (conc " AND "
+			   ;; Generate: " AND x LIKE 'keypatt' ..."
+			   (if (null? keypatts) ""
+			       (conc " AND "
 				     (string-join 
 				      (map (lambda (keypatt)
 					     (let ((key  (car keypatt))
 						   (patt (cadr keypatt)))
 					       (db:patt->like key patt)))
 					   keypatts)
 				      " AND ")))
-		           " AND state != 'deleted' ORDER BY event_time DESC "
-		           (if (number? count)
-		               (conc " LIMIT " count)
-		               "")
-		           (if (number? offset)
-		               (conc " OFFSET " offset)
-		               ""))))
+			   " AND state != 'deleted' ORDER BY event_time DESC "
+			   (if (number? count)
+			       (conc " LIMIT " count)
+			       "")
+			   (if (number? offset)
+			       (conc " OFFSET " offset)
+			       ""))))
     (debug:print-info 11 "db:get-runs START qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
-    (sqlite3:for-each-row
-     (lambda (a . x)
-       (set! res (cons (apply vector a x) res)))
-     db
-     qrystr
-     )
+    (db:with-db dbstruct #f #f
+		(lambda (db)		
+		  (sqlite3:for-each-row
+		   (lambda (a . x)
+		     (set! res (cons (apply vector a x) res)))
+		   db
+		   qrystr
+		   )))
     (debug:print-info 11 "db:get-runs END qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
     (vector header res)))
 
 ;; Get all targets from the db
 ;;
@@ -1184,17 +1187,19 @@
 				(if limit  (conc " LIMIT " limit)   " ")
 				(if offset (conc " OFFSET " offset) " ")
 				";"
 				)))
     (debug:print-info 8 "db:get-tests-for-run qry=" qry)
-    (sqlite3:for-each-row 
-     (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment)
-       (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res)))
-     (db:get-db dbstruct run-id)
-     qry
-     run-id
-     )
+    (db:with-db dbstruct run-id #f
+		(lambda (db)
+		  (sqlite3:for-each-row 
+		   (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment)
+		     (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res)))
+		   db
+		   qry
+		   run-id
+		   )))
     (case qryvals
       ((shortlist)(map db:test-short-record->norm res))
       ((#f)       res)
       (else       res))))
 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -429,11 +429,11 @@
     (let loop ((count 0))
       ;; Use this opportunity to sync the inmemdb to db
       (let ((start-time (current-milliseconds))
 	    (sync-time  #f)
 	    (rem-time   #f))
-	(if *inmemdb* (db:sync-touched *inmemdb*))
+	(if *inmemdb* (db:sync-touched *inmemdb* force-sync: #t))
 	(set! sync-time  (- (current-milliseconds) start-time))
 	(set! rem-time (quotient (- 4000 sync-time) 1000))
 	(debug:print 0 "SYNC: time= " sync-time ", rem-time=" rem-time)
 	(if (and (<= rem-time 4)
 		 (> rem-time 0))
@@ -478,11 +478,11 @@
 	    (loop 0))
 	  (begin
 	    (debug:print-info 0 "Starting to shutdown the server.")
 	    ;; need to delete only *my* server entry (future use)
 	    (set! *time-to-exit* #t)
-	    (if *inmemdb* (db:sync-touched *inmemdb*))
+	    (if *inmemdb* (db:sync-touched *inmemdb* force-sync: #t))
 	    (open-run-close tasks:server-deregister-self tasks:open-db (get-host-name))
 	    (thread-sleep! 1)
 	    (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
 	    (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
 	    (debug:print-info 0 "Average cached write time "

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -523,11 +523,12 @@
 
     (if (not (hash-table-ref/default *toptest-paths* testname #f))
 	(let* ((testinfo       (rmt:get-test-info-by-id run-id test-id)) ;;  run-id testname item-path))
 	       (curr-test-path (if testinfo ;; (filedb:get-path *fdb*
 							     ;; (db:get-path dbstruct
-				   (rmt:sdb-qry 'getstr (db:test-get-rundir testinfo)) ;; )
+				   ;; (rmt:sdb-qry 'getstr 
+				   (db:test-get-rundir testinfo) ;; ) ;; )
 				   #f)))
 	  (hash-table-set! *toptest-paths* testname curr-test-path)
 	  ;; NB// Was this for the test or for the parent in an iterated test?
 	  ;;(cdb:test-set-rundir! *runremote* run-id testname "" (filedb:register-path *fdb* lnkpath)) ;; toptest-path)
 	  (rmt:general-call 'test-set-rundir run-id lnkpath testname "") ;; toptest-path)