Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -210,46 +210,61 @@
 ;;
 ;;(define *db-open-mutex* (make-mutex))
 
 (define (db:lock-create-open fname initproc)
   (let* ((parent-dir   (or (pathname-directory fname)(current-directory))) ;; no parent? go local
+         (raw-fname    (pathname-file fname))
 	 (dir-writable (file-write-access? parent-dir))
 	 (file-exists  (file-exists? fname))
 	 (file-write   (if file-exists
 			   (file-write-access? fname)
 			   dir-writable )))
     ;;(mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped.
     (if file-write ;; dir-writable
 	(condition-case
-	    (let ((db      (sqlite3:open-database fname)))
-	      (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
-	      (sqlite3:execute db "PRAGMA synchronous = 0;")
-	      (if (not file-exists)
-		  (begin
-		    (if (and (configf:lookup *configdat* "setup" "use-wal")
-			     (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
-			(sqlite3:execute db "PRAGMA journal_mode=WAL;")
-			(print "Creating " fname " in NON-WAL mode."))
-		    (initproc db)))
-	      db)
-	  (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-	  (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
-	  (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
-	  (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
-	  (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
-
+         (let* ((lockfname   (conc fname ".lock"))
+                (readyfname  (conc parent-dir "/.ready-" raw-fname))
+                (readyexists (file-exists? readyfname)))
+           (if (not readyexists)
+               (common:simple-file-lock-and-wait lockfname))
+           (let ((db      (sqlite3:open-database fname)))
+             (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
+             (sqlite3:execute db "PRAGMA synchronous = 0;")
+             (if (not file-exists)
+                 (begin
+                   (if (and (configf:lookup *configdat* "setup" "use-wal")
+                            (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
+                       (sqlite3:execute db "PRAGMA journal_mode=WAL;")
+                       (print "Creating " fname " in NON-WAL mode."))
+                   (initproc db)))
+             (if (not readyexists)
+                 (begin
+                   (common:simple-file-release-lock lockfname)
+                   (with-output-to-file
+                       readyfname
+                     (lambda ()
+                       (print "Ready at " 
+                              (seconds->year-work-week/day-time 
+                               (current-seconds)))))))
+             db))
+         (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+         (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
+         (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
+         (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
+         (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
+        
 	(condition-case
-	    (begin
-	      (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
-	      (let ((db (sqlite3:open-database fname)))
-		;;(mutex-unlock! *db-open-mutex*)
-		db))
-	  (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-	  (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
-	  (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
-	  (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
-	  (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
+         (begin
+           (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
+           (let ((db (sqlite3:open-database fname)))
+             ;;(mutex-unlock! *db-open-mutex*)
+             db))
+         (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+         (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
+         (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
+         (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
+         (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
 	)))
 
 
 
 

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6402)
+(define megatest-version 1.6403)
 

Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -4,10 +4,12 @@
 # nbfake - capture command output in a logfile
 #
 # nbfake behavior can be changed by setting the following env vars:
 #   NBFAKE_HOST       SSH to $NBFAKE_HOST and run command
 #   NBFAKE_LOG        Logfile for nbfake output
+#   NB_WASH_GROUPS    comma-separated list of groups to wash into
+#   NB_WASH_ENABLED   must be set in order to enable wash groups
 #
 ###############################################################################
 
 if [[ -z "$@" ]]; then
   cat <<__EOF
@@ -17,10 +19,12 @@
 nbfake <command to run>
 
 nbfake behavior can be changed by setting the following env vars:
    NBFAKE_HOST       SSH to \$NBFAKE_HOST and run command
    NBFAKE_LOG        Logfile for nbfake output
+   NB_WASH_GROUPS    comma-separated list of groups to wash into
+   NB_WASH_ENABLED   must be set in order to enable wash groups
 
 __EOF
   exit
 fi
 
@@ -53,24 +57,31 @@
 # Set default nbfake log
 
 if [[ -z "$MY_NBFAKE_LOG" ]]; then
   MY_NBFAKE_LOG=NBFAKE-$(date +%GWW%V.%u_%T)
 fi
+
+# wash groups handling. Default is no action
+WASHCMD=""
+if [[ -n ${NB_WASH_ENABLED+1} && -n ${NB_WASH_GROUPS+1} ]]; then
+   grouplist=`echo $NB_WASH_GROUPS | tr ',' ' '`
+   WASHCMD="wash -q -n $grouplist -X"
+fi
 
 #==============================================================================
 # Run and log
 #==============================================================================
 
 cat <<__EOF >&2
 #======================================================================
 # NBFAKE logging command to: $MY_NBFAKE_LOG
-#     $*
+#     $WASHCMD $*
 #======================================================================
 __EOF
 
 if [[ -z "$MY_NBFAKE_HOST" ]]; then
   # Run locally
-  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &"
+  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &"
 else
   # run remotely
-  ssh -X -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &\""
+  ssh -X -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &\""
 fi