Index: tcp-transportmod.scm
==================================================================
--- tcp-transportmod.scm
+++ tcp-transportmod.scm
@@ -303,11 +303,11 @@
        (try-again)))))
 
 ;; client side handler
 ;;
 ;;(tt:handler #<tt> get-keys #f () 2 #f "/home/matt/data/megatest/ext-tests" #f "main.db" "ext-tests" "/home/matt/data/megatest/bin/.22.04/../megatest")
-;;
+;;g
 (define (tt:handler ttdat cmd run-id params attemptnum readonly-mode dbfname testsuite mtexe server-start-proc)
   ;; connect-to-server will start a server if needed.
   (let* ((areapath (tt-areapath ttdat))
 	 (conn     (tt:client-connect-to-server ttdat dbfname run-id testsuite server-start-proc))) ;; looks up conn keyed by dbfname
     (if conn
@@ -594,11 +594,11 @@
 	  ;; by here we have a trustworthy list of servers and we have removed the .servinfo file for any unresponsive servers
 	  ;; and the list is in good-srvrs
 	  (cond
 	   ((not home-host) ;; no servers yet, go ahead and start
 	    (debug:print-info 0 *default-log-port* "No servers yet, starting on "(get-host-name)))
-	   ((> (length good-srvrs) 2) ;; don't need more, just exit
+	   ((> (length good-srvrs) 3) ;; don't need more, just exit
 	    (debug:print-info 0 *default-log-port* "Have "(length good-srvrs)", no need for more, exiting.")
 	    (exit))
 	   ((not (equal? home-host (get-host-name))) ;; there is a home-host and we are not on it
 	    (debug:print-info 0 *default-log-port* "Prime main server is on host "home-host", but we are on host "(get-host-name)", exiting.")
 	    (exit))
@@ -622,10 +622,12 @@
 		    (begin
 		      (debug:print 0 *default-log-port* "ERROR: (tt-port ttdat) no port set! Exiting.")
 		      (exit)))))
 	  
 	  ;; create a servinfo file start keep-running
+	  ;; On WSL there seems to be a race condition where the .servinfo file
+	  ;; is not created fast enough
           (debug:print 0 *default-log-port* "Creating servinfo file for " dbfname)
 	  (tt:create-server-registration-file ttdat dbfname)
 	  (procinf-status-set! *procinf* "running")
 	  (tt-state-set! ttdat 'running)
 	  (dbfile:with-no-sync-db
@@ -664,18 +666,21 @@
 	     (my-index  (list-index (lambda (x)
 				      (equal? (list-ref x 6)
 					      (tt-servinf-file ttdat)))
 				    servers))
 	     (ok         (cond
+			  ((not my-index)
+			   (debug:print 0 *default-log-port* "WARNING: Apparently I don't exist.")
+			   'not-yet) ;; keep trying ?
 			  ((not *server-run*)
 			   (debug:print 0 *default-log-port* "WARNING: received a stop server from client by remote request.")
 			   #f)
 			  ((null? servers)
 			   (debug:print 0 *default-log-port* "WARNING: no servinfo files found, this cannot be.")
 			   #f) ;; not ok
-			  ((> my-index 2)
-			   (debug:print 0 *default-log-port* "WARNING: there are more than two servers ahead of me, I'm not needed, exiting.")
+			  ((> my-index 3)
+			   (debug:print 0 *default-log-port* "WARNING: there are more than three servers ahead of me, I'm not needed, exiting.")
 			   #f) ;; not ok to not be in first three
 			  ((eq? (tt-state ttdat) 'running) #t) ;; we are good to keep going
 			  ((> (- (current-seconds) start-time) 30)
 			   (debug:print 0 *default-log-port* "WARNING: over 30 seconds and not yet in runnning mode. Exiting.")
 			   #f)
@@ -728,11 +733,18 @@
     (assert (and host port) "FATAL: tt:create-server-registration-file called with no conn, dbfname="dbfname)
     (tt-servinf-file-set! ttdat servinf)
     (with-output-to-file servinf
       (lambda ()
 	(print "SERVER STARTED: "host":"port" AT "(current-seconds)" server-id: "serv-id" pid: "(current-process-id)" dbfname: "dbfname)))
-      serv-id))
+    (let loop ((count 0))
+      (if (not (file-exists? servinf))
+	  (begin
+	    (debug:print 0 *default-log-port* "WARNING: file "servinf" was created but it doesn't show up on disk! We'll try again.")
+	    (thread-sleep! 1)
+	    (if (< count 10)
+		(loop (+ count 1))))))
+    serv-id))
 
 ;; find valid server
 ;; get servers listed, last part of name must match :<dbfname>
 ;; if more than one, wait one second and look again
 ;; future: ping oldest, if alive remove other :<dbfname> files
@@ -829,11 +841,11 @@
 	    #f)
 	   ((> nrun 100)
 	    (debug:print 0 *default-log-port* nrun" servers running on " (get-host-name) ", not starting another.")
 	    (thread-sleep! 1)
 	    #f)
-	   ((> trying 2)
+	   ((> trying 3)
 	    (debug:print 0 *default-log-port* trying" servers registered in .servinfo dir. not starting another.")
 	    (thread-sleep! 1)
 	    #f)
 	   (else
 	    (if (not (file-exists? (conc areapath"/logs")))