Overview
Comment: | Trying to start main.db server |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6584-ck5 |
Files: | files | file ages | folders |
SHA1: |
ef485de0ef68ebebb4ddba6ec1b320af |
User & Date: | matt on 2021-04-25 22:29:09 |
Other Links: | branch diff | manifest | tags |
Context
2021-04-25
| ||
23:08 | main.db mostly opens check-in: a6984512c6 user: matt tags: v1.6584-ck5 | |
22:29 | Trying to start main.db server check-in: ef485de0ef user: matt tags: v1.6584-ck5 | |
05:34 | Added area key check-in: f160cf8d52 user: matt tags: v1.6584-ck5 | |
Changes
Modified dbmod.scm from [98add3bd5b] to [a51a71cf55].
︙ | ︙ | |||
115 116 117 118 119 120 121 122 | (define (db:run-id->first-num run-id) (let* ((s (number->string run-id)) (l (string-length s))) (substring s (- l 1) l))) ;; 1234 => 4/1234.db ;; #f => 0/main.db ;; | > | > > > > > | | | > | > > > > > > | | | | | | | | 115 116 117 118 119 120 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 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | (define (db:run-id->first-num run-id) (let* ((s (number->string run-id)) (l (string-length s))) (substring s (- l 1) l))) ;; 1234 => 4/1234.db ;; #f => 0/main.db ;; (abandoned the idea of num/db) ;; (define (db:run-id->path apath run-id) (conc apath"/"(db:run-id->dbname run-id))) (define (db:dbname->path apath dbname) (conc apath"/"dbname)) ;; (let ((firstnum (if run-id ;; (db:run-id->first-num run-id) ;; "0"))) ;; (conc *toppath* "/.dbs/" ;; firstnum"/" ;; (or run-id "main")".db"))) (define (db:run-id->dbname run-id) (if (number? run-id) (conc ".db/" (modulo run-id 100) ".db") (conc ".db/main.db"))) ;; record for keeping state,status and count for doing roll-ups in ;; iterated tests ;; (defstruct dbr:counts (state #f) (status #f) (count 0)) ;; Retrieve a dbdat given run-id, open and setup both inmemory and ;; db file if needed ;; ;; if run-id => get run specific db ;; if #f => get main.db ;; if db already open - return inmem ;; if db not open, open inmem, rundb and sync then return inmem ;; inuse gets set automatically for rundb's ;; (define (db:get-dbdat dbstruct apath run-id) (let ((dbdat (dbr:dbstruct-get-dbdat dbstruct run-id))) (if dbdat dbdat (let* ((dbfile (db:run-id->path apath run-id)) (newdbdat (db:open-dbdat apath run-id db:initialize-db))) (dbr:dbstruct-dbdat-put! dbstruct run-id newdbdat) newdbdat)))) ;; get the inmem db for actual db operations ;; (define (db:get-inmem dbstruct run-id) (dbr:dbdat-inmem (db:get-dbdat dbstruct run-id))) ;; get the handle for the on-disk db ;; (define (db:get-ddb dbstruct apath run-id) (dbr:dbdat-db (db:get-dbdat dbstruct apath run-id))) ;; open or create the disk db file ;; create and fill the inmemory db ;; assemble into dbr:dbdat struct and return ;; (define (db:open-dbdat apath run-id dbinit-proc) (let* ((dbfile (db:run-id->path apath run-id)) (db (db:open-run-db dbfile dbinit-proc)) (inmem (db:open-inmem-db dbinit-proc)) (dbdat (make-dbr:dbdat db: db inmem: inmem run-id: run-id fname: dbfile))) |
︙ | ︙ | |||
214 215 216 217 218 219 220 | ;; sync disk db to inmem ;; ;; called in http-transport and replicated in rmt.scm for *local* access. ;; (define (db:setup run-id) (assert *toppath* "FATAL: db:setup called before toppath is available.") (let* ((dbstruct (make-dbr:dbstruct))) | | | | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | ;; sync disk db to inmem ;; ;; called in http-transport and replicated in rmt.scm for *local* access. ;; (define (db:setup run-id) (assert *toppath* "FATAL: db:setup called before toppath is available.") (let* ((dbstruct (make-dbr:dbstruct))) (db:get-dbdat dbstruct *toppath* run-id) (set! *dbstruct-db* dbstruct) dbstruct)) ;;====================================================================== ;; setting/getting a lock on the db for only one server per db ;; ;; NOTE: ;; These operate directly on the disk file, NOT on the inmemory db ;; The lockname is the filename (can have many to one, run-id to fname ;;====================================================================== (define (db:get-iam-server-lock dbstruct apath run-id) (let* ((dbh (db:get-ddb apath dbstruct run-id)) (dbfname (db:run-id->path run-id))) (sqlite3:with-transaction dbh (lambda () (let* ((locked (db:get-locker dbh dbfname))) (if (not locked) (db:take-lock dbh dbfname))))))) |
︙ | ︙ |
Modified http-transportmod.scm from [55e6935b48] to [96c70e902e].
︙ | ︙ | |||
467 468 469 470 471 472 473 | ptype: 'server))) ;; ya, fake it for now ;; (define (register-server-in-db db-file) #t) | | > > | | | | | | | | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | ptype: 'server))) ;; ya, fake it for now ;; (define (register-server-in-db db-file) #t) (define (get-pkts-dir #!optional (apath #f)) (let* ((effective-toppath (or *toppath* apath))) (assert effective-toppath "ERROR: get-pkts-dir called without *toppath* set. Exiting.") (let* ((pdir (conc effective-toppath "/.meta/srvpkts"))) (if (file-exists? pdir) pdir (begin (create-directory pdir #t) pdir))))) ;; given a pkts dir read ;; (define (get-all-server-pkts pktsdir-in pktspec) (let* ((pktsdir (if (file-exists? pktsdir-in) pktsdir-in (begin |
︙ | ︙ | |||
572 573 574 575 576 577 578 | ;; server last used then start shutdown ;; This thread waits for the server to come alive (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server") (let* ((run-id (let ((rid (args:get-arg "-run-id"))) (if rid (string->number rid) #f))) | | | 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 | ;; server last used then start shutdown ;; This thread waits for the server to come alive (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server") (let* ((run-id (let ((rid (args:get-arg "-run-id"))) (if rid (string->number rid) #f))) (db-file (db:run-id->path *toppath* run-id)) (sdat #f) (tmp-area (common:get-db-tmp-area)) (server-start-time (current-seconds)) (pkts-dir (get-pkts-dir)) (server-key (server:mk-signature)) (server-info (let loop ((start-time (current-seconds)) (changed #t) |
︙ | ︙ |
Modified megatest.scm from [e84f4557e9] to [7dbfbe85c3].
︙ | ︙ | |||
2451 2452 2453 2454 2455 2456 2457 | (args:get-arg "-diff-email")) (set! *didsomething* #t) (exit 0))) (if (or (getenv "MT_RUNSCRIPT") (args:get-arg "-repl") (args:get-arg "-load")) | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 | (args:get-arg "-diff-email")) (set! *didsomething* #t) (exit 0))) (if (or (getenv "MT_RUNSCRIPT") (args:get-arg "-repl") (args:get-arg "-load")) (let* ((toppath (launch:setup))) ;; (dbstruct (if (and toppath ;; #;(common:on-homehost?)) ;; (db:setup #f) ;; sets up main.db ;; #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f))) (if *toppath* (cond ((getenv "MT_RUNSCRIPT") ;; How to run megatest scripts ;; ;; #!/bin/bash ;; ;; export MT_RUNSCRIPT=yes ;; megatest << EOF ;; (print "Hello world") ;; (exit) ;; EOF (repl)) (else (begin ;; (set! *db* dbstruct) ;; (import extras) ;; might not be needed ;; (import csi) ;; (import readline) (import apropos archivemod commonmod configfmod dbmod debugprint ezstepsmod http-transportmod launchmod processmod rmtmod runsmod servermod tasksmod testsmod) (set-history-length! 300) (load-history-from-file ".megatest_history") (current-input-port (make-linenoise-port)) ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ... ;; (if *use-new-readline* ;; (begin ;; (install-history-file (get-environment-variable "HOME") ".megatest_history") ;; [homedir] [filename] [nlines]) ;; (current-input-port (make-readline-port "megatest> "))) ;; (begin ;; (gnu-history-install-file-manager ;; (string-append ;; (or (get-environment-variable "HOME") ".") "/.megatest_history")) ;; (current-input-port (make-gnu-readline-port "megatest> ")))) (if (args:get-arg "-repl") (repl) (load (args:get-arg "-load"))) ;; (db:close-all dbstruct) <= taken care of by on-exit call ) (exit))) (set! *didsomething* #t)))) ;;====================================================================== ;; Wait on a run to complete ;;====================================================================== (if (and (args:get-arg "-run-wait") (not (or (args:get-arg "-run") |
︙ | ︙ |
Modified rmtmod.scm from [7416ecbdb6] to [0f70a2dcff].
︙ | ︙ | |||
145 146 147 148 149 150 151 152 153 154 155 156 | #f))) (if cinfo cinfo (if (server:check-if-running areapath) (client:setup areapath) #f)))) ;;====================================================================== ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname)) ;; (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > | | > > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | #f))) (if cinfo cinfo (if (server:check-if-running areapath) (client:setup areapath) #f)))) (defstruct rmt:remote (conns (make-hash-table)) ;; apath/dbname => rmt:conn ) (defstruct rmt:conn (apath #f) (dbname #f) (fullname #f) (hostport #f) (lastmsg 0) (expires 0)) (define *rmt:remote* (make-rmt:remote)) ;; do we have a connection to apath dbname and ;; is it not expired? then return it ;; (define (rmt:get-existing-live-conn remote apath dbname) (let* ((fullname (db:dbname->path apath dbname)) (conn (hash-table-ref/default (rmt:remote-conns remote) fullname #f))) (if (and conn (> (current-seconds) (rmt:conn-expires conn))) conn #f))) ;; looks for a connection to main ;; connections for other servers happens by requesting from main ;; (define (rmt:open-main-connection remote apath) (let* ((pktsdir (get-pkts-dir apath)) (all-srvpkts (get-all-server-pkts pktsdir *srvpktspec*)) (viable-srvs (get-viable-servers all-srvpkts apath)) (the-srv (get-the-server viable-srvs apath)) (dbname (db:run-id->dbname #f)) (start-main-srv (lambda () ;; srv not ready, delay a little and try again (system (conc "nbfake megatest -server - -area "apath" -db "dbname)) (thread-sleep! 1.5) (rmt:open-main-connection remote apath) ;; TODO: Add limit to number of tries ))) (if the-srv ;; yes, we have a server, now try connecting to it (let* ((srv-addr (server-address the-srv)) (srvready (server-ready? srv-addr)) (fullpath (db:dbname->path apath dbname))) (if srvready (hash-table-set! (rmt:remote-conns remote) fullpath (make-rmt:conn apath: apath dbname: dbname fullname: fullpath hostport: srv-addr lastmsg: (current-seconds) expires: (+ (current-seconds) 60) ;; this needs to be gathered during the ping )) (start-main-srv))) (start-main-srv)))) (define (rmt:general-open-connection remote apath dbname) (let ((mainconn (rmt:get-existing-live-conn remote apath (db:run-id->dbname #f)))) (if (not mainconn)(rmt:open-main-connection remote apath)) ;; TODO - call main for connection info )) ;;====================================================================== ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname)) ;; (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) (if (not *rmt:remote*)(set! *rmt:remote* (make-rmt:remote))) (let* ((apath *toppath*) (conns *rmt:remote*) (dbname (db:run-id->dbname rid))) (rmt:send-receive-real conns apath dbname rid params))) ;; db is at apath/.db/dbname, rid is an intermediary solution and will be removed ;; sometime in the future ;; (define (rmt:send-receive-real remote apath dbname rid params) ;; do we have a connection to the needed db? ;; has the connection expired? (let connloop ((conn (rmt:get-existing-live-conn remote apath dbname))) (if (not conn) (connloop (rmt:general-open-connection remote apath dbname)) (begin #t ;; here we do the actual connection work )))) ;; ;; ;; start attemptnum at 1 so the modulo below works as expected ;; ;; #;(common:telemetry-log (conc "rmt:"(->string cmd)) ;; ;; payload: `((rid . ,rid) ;; ;; (params . ,params))) ;; ;; ;; ;; (if (> attemptnum 2) ;; ;; (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum)) ;; ;; |
︙ | ︙ |
Modified vg.scm from [d31bf89ee1] to [d212ba7d90].
︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | (use typed-records srfi-1) (declare (unit vg)) (use canvas-draw iup) (import canvas-draw-iup) (include "vg_records.scm") ;; ;; structs ;; ;; ;; (defstruct vg:lib comps) ;; (defstruct vg:comp objs name file) ;; ;; extents caches extents calculated on draw ;; ;; proc is called on draw and takes the obj itself as a parameter | > > > > > > > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (use typed-records srfi-1) (declare (unit vg)) (use canvas-draw iup) (import canvas-draw-iup) (include "vg_records.scm") ;;====================================================================== ;; IDEA ;; ;; make it possible to instantiate a vg drawing inside a vg drawing ;; ;;====================================================================== ;; ;; structs ;; ;; ;; (defstruct vg:lib comps) ;; (defstruct vg:comp objs name file) ;; ;; extents caches extents calculated on draw ;; ;; proc is called on draw and takes the obj itself as a parameter |
︙ | ︙ |