Overview
Comment: | Mixed up tt:handler and tt:client-connect-to-server. tt:handler is a bad name. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.80-tcp-inmem |
Files: | files | file ages | folders |
SHA1: |
3970f89cba77f416ac9fdf1666a10fc3 |
User & Date: | matt on 2023-02-16 21:16:50 |
Other Links: | branch diff | manifest | tags |
Context
2023-02-16
| ||
21:40 | wip check-in: 372980efb7 user: matt tags: v1.80-tcp-inmem | |
21:16 | Mixed up tt:handler and tt:client-connect-to-server. tt:handler is a bad name. check-in: 3970f89cba user: matt tags: v1.80-tcp-inmem | |
20:52 | wip check-in: 0cc9990634 user: matt tags: v1.80-tcp-inmem | |
Changes
Modified tcp-transportmod.scm from [922ca0812d] to [99fe61945c].
︙ | ︙ | |||
91 92 93 94 95 96 97 | (host-port #f) (cmd-thread #f) ) (define (tt:make-remote areapath) (make-tt area: areapath)) | | | | < | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | (host-port #f) (cmd-thread #f) ) (define (tt:make-remote areapath) (make-tt area: areapath)) ;; do all the busy work of finding and setting up conn for ;; connecting to a server ;; (define (tt:client-connect-to-server ttdat dbfname run-id) (let* ((conn (hash-table-ref/default (tt-conns ttdat) dbfname #f))) (if conn conn ;; we are already connected to the server (let* ((sdat (tt:get-current-server-info ttdat dbfname run-id))) (match sdat ((host port start-time server-id pid) |
︙ | ︙ | |||
122 123 124 125 126 127 128 | (common:find-local-megatest) run-id) (thread-sleep! 1) (tt:client-connect-to-server ttdat dbfname run-id))))))) ;; client side handler ;; | | | | | > > > > | | | | | | | | | | | | | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | (common:find-local-megatest) run-id) (thread-sleep! 1) (tt:client-connect-to-server ttdat dbfname run-id))))))) ;; client side handler ;; (define (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe) ;; NOTE: areapath is passed in and in tt struct. We'll use passed in value for now. (let* ((conn (tt:client-connect-to-server ttdat dbfname run-id))) ;; (hash-table-ref/default (tt-conns ttdat) dbfname #f))) (if conn ;; have connection, call the server (let* ((res (tt:send-receive ttdat conn cmd run-id params))) (cond ((member res '(busy starting)) (thread-sleep! 1) (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe)) (else res))) (begin (thread-sleep! 1) ;; give it a rest and try again (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe))))) ;; no conn yet, find and or start and find a server ;; (let* ((server (tt:find-server ttdat dbfname))) ;; (if server ;; (let* ((conn (tt:client-connect-to-server server))) ;; (hash-table-set! (tt-conns ttdat) dbfname conn) ;; (tt:handler ttdat cmd run-id params attemptnum area-dat areapath readonly-mode ;; dbfname testsuite mtexe)) ;; ;; no server, try to start a server process ;; (begin ;; (tt:server-process-run areapath testsuite mtexe run-id) ;; #!key (profile-mode "")) ;; (thread-sleep! 1) ;; (tt:handler ttdat cmd run-id params attemptnum area-dat areapath ;; readonly-mode dbfname testsuite mtexe))))))) (define (tt:bid-for-servership run-id) #f) (define (tt:get-current-server-info ttdat dbfname run-id) (let* ((sfiles (tt:find-server ttdat dbfname))) (case (length sfiles) |
︙ | ︙ | |||
350 351 352 353 354 355 356 | ;; (define (tt:server-process-run areapath testsuite mtexe run-id #!key (profile-mode "")) ;; areapath is *toppath* for a given testsuite area (let* ((logfile (conc areapath "/logs/server.log")) ;; -" curr-pid "-" target-host ".log")) (cmdln (conc mtexe " -server - ";; (or target-host "-") " -m testsuite:" testsuite | | > | 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | ;; (define (tt:server-process-run areapath testsuite mtexe run-id #!key (profile-mode "")) ;; areapath is *toppath* for a given testsuite area (let* ((logfile (conc areapath "/logs/server.log")) ;; -" curr-pid "-" target-host ".log")) (cmdln (conc mtexe " -server - ";; (or target-host "-") " -m testsuite:" testsuite " -run-id " (or run-id "main") " -db " (dbmod:run-id->dbfname run-id) " " profile-mode ))) ;; (conc " >> " logfile " 2>&1 &"))))) ;; we want the remote server to start in *toppath* so push there (push-directory areapath) (debug:print 0 *default-log-port* "INFO: Trying to start server in tcp mode (" cmdln ") ...") (debug:print 0 *default-log-port* "INFO: starting server at " (common:human-time)) (system (conc "nbfake " cmdln)) |
︙ | ︙ |