Overview
Comment: | change default for server-query-threshold to -1, forcing always a server to start Added test for vars with . |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
cf47596912ba3823d0f3e3dbef94d0cd |
User & Date: | matt on 2014-10-28 00:18:36 |
Other Links: | branch diff | manifest | tags |
Context
2014-10-28
| ||
23:08 | Don't do threaded registration check-in: 2513a8d303 user: matt tags: v1.60 | |
00:18 | change default for server-query-threshold to -1, forcing always a server to start Added test for vars with . check-in: cf47596912 user: matt tags: v1.60 | |
2014-10-27
| ||
20:17 | Backed out mutex and locking on sync and moved busy handler ahead of db initialize check-in: ce3b49f7c4 user: mrwellan tags: v1.60 | |
Changes
Modified rmt.scm from [6008614567] to [a8f8013949].
︙ | ︙ | |||
86 87 88 89 90 91 92 | (let ((res (http-transport:client-api-send-receive run-id connection-info cmd jparams))) (http-transport:server-dat-update-last-access connection-info) (if res (db:string->obj res) (let ((new-connection-info (client:setup run-id))) (debug:print 0 "WARNING: Communication failed, trying call to http-transport:client-api-send-receive again.") (rmt:send-receive cmd run-id params)))) | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | (let ((res (http-transport:client-api-send-receive run-id connection-info cmd jparams))) (http-transport:server-dat-update-last-access connection-info) (if res (db:string->obj res) (let ((new-connection-info (client:setup run-id))) (debug:print 0 "WARNING: Communication failed, trying call to http-transport:client-api-send-receive again.") (rmt:send-receive cmd run-id params)))) (let ((max-avg-qry (string->number (or (configf:lookup *configdat* "server" "server-query-threshold") "-1")))) (debug:print-info 4 "no server and read-only query, bypassing normal channel") ;; (if (rmt:write-frequency-over-limit? cmd run-id)(server:kind-run run-id)) (let ((curr-max (rmt:get-max-query-average))) (if (> (cdr curr-max) max-avg-qry) (begin (debug:print-info 3 "Max average query, " (inexact->exact (round (cdr curr-max))) "ms (" (car curr-max) ") exceeds " max-avg-qry ", try starting server ...") (server:kind-run run-id)))) |
︙ | ︙ | |||
166 167 168 169 170 171 172 | (duration (- (current-milliseconds) start))) (rmt:update-db-stats cmd params duration) ;; mark this run as dirty if this was a write (if (not (member cmd api:read-only-queries)) (let ((start-time (current-seconds))) (mutex-lock! *db-multi-sync-mutex*) (let ((last-sync (hash-table-ref/default *db-local-sync* run-id 0))) | > | | > | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | (duration (- (current-milliseconds) start))) (rmt:update-db-stats cmd params duration) ;; mark this run as dirty if this was a write (if (not (member cmd api:read-only-queries)) (let ((start-time (current-seconds))) (mutex-lock! *db-multi-sync-mutex*) (let ((last-sync (hash-table-ref/default *db-local-sync* run-id 0))) (if ;; (and (> (- start-time last-sync) 5) ;; every five seconds ;; (common:db-access-allowed?)) (begin ;; MOVE THIS TO A THREAD? (db:multi-db-sync (list run-id) 'new2old) (if (common:low-noise-print 30 "sync new to old") (debug:print-info 0 "Sync of newdb to olddb for run-id " run-id " completed in " (- (current-seconds) start-time) " seconds")) (hash-table-set! *db-local-sync* run-id start-time)))) (mutex-unlock! *db-multi-sync-mutex*))) res))) (define (rmt:send-receive-no-auto-client-setup connection-info cmd run-id params) (let* ((run-id (if run-id run-id 0)) (jparams (db:obj->string params)) ;; (rmt:dat->json-str params)) |
︙ | ︙ |
Modified tests/fullrun/runconfigs.config from [cdf025da8a] to [30a30e595a].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | [default/ubuntu/nfs] WACKYVAR2 #{runconfigs-get CURRENT} [ubuntu/nfs/none] WACKYVAR2 #{runconfigs-get CURRENT} SOMEVAR2 This should show up in SOMEVAR4 if the target is ubuntu/nfs/none [default] SOMEVAR3 #{rget SOMEVAR} SOMEVAR4 #{rget SOMEVAR2} SOMEVAR5 #{runconfigs-get SOMEVAR2} [this/a/test] | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | [default/ubuntu/nfs] WACKYVAR2 #{runconfigs-get CURRENT} [ubuntu/nfs/none] WACKYVAR2 #{runconfigs-get CURRENT} SOMEVAR2 This should show up in SOMEVAR4 if the target is ubuntu/nfs/none VARWITHDOLLARSIGNS The$USER/signs/should/be/replaced/with/variable [default] SOMEVAR3 #{rget SOMEVAR} SOMEVAR4 #{rget SOMEVAR2} SOMEVAR5 #{runconfigs-get SOMEVAR2} [this/a/test] |
︙ | ︙ |
Added tests/fullrun/tests/test_mt_vars/eval_vars.sh version [786761600e].
> > > > > > > | 1 2 3 4 5 6 7 | #!/bin/bash if env | grep VARWITHDOLLARSIGNS | grep USER;then exit 1 # fails! else exit 0 # good! fi |
Modified tests/fullrun/tests/test_mt_vars/testconfig from [a0c61adcaf] to [0d7c3216f9].
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | empty_var empty_var.sh # VACKYVAR should be set to a path vackyvar vackyvar.sh # test-path and test-file test-path test-path-file.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] | > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | empty_var empty_var.sh # VACKYVAR should be set to a path vackyvar vackyvar.sh # test-path and test-file test-path test-path-file.sh # verify that vars with $ signs get expanded varwithdollar eval_vars.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] |
︙ | ︙ |
tests/installall/config/megatest.config.dat became a symlink with target [736a5da885].
tests/installall/config/runconfigs.config.dat became a symlink with target [3b8f260acb].