Overview
Comment: | Somewhat speculative and partial fix for the non updating state/status on test run with transport=fs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 |
Files: | files | file ages | folders |
SHA1: |
0b313f721805c58236ae52057afc6e0b |
User & Date: | mrwellan on 2013-09-13 18:17:39 |
Other Links: | branch diff | manifest | tags |
Context
2013-09-13
| ||
22:56 | Join monitor thread in launch check-in: c84bb1b895 user: matt tags: v1.55 | |
18:17 | Somewhat speculative and partial fix for the non updating state/status on test run with transport=fs check-in: 0b313f7218 user: mrwellan tags: v1.55 | |
2013-09-12
| ||
23:42 | Fixed typo check-in: cbc9328c04 user: matt tags: v1.55 | |
Changes
Modified launch.scm from [9aa0c0384c] to [680b277def].
︙ | |||
134 135 136 137 138 139 140 | 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 191 192 193 194 195 | + - + + + + - + + + + + + + + + + - + | ;; environment overrides are done *before* the remaining critical envars. (alist->env-vars env-ovrd) (set-megatest-env-vars run-id) (set-item-env-vars itemdat) (save-environment-as-files "megatest") ;; open-run-close not needed for test-set-meta-info (tests:set-full-meta-info #f test-id run-id 0 work-area) |
︙ | |||
222 223 224 225 226 227 228 | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | - + | (mutex-lock! m) (vector-set! exit-info 0 pid) (vector-set! exit-info 1 exit-status) (vector-set! exit-info 2 exit-code) (mutex-unlock! m) (if (eq? pid-val 0) (begin |
︙ | |||
328 329 330 331 332 333 334 | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | - + - - + + - + | (sqlite3:finalize! tdb) (exit 1)))) (set! kill-tries (+ 1 kill-tries)) (mutex-unlock! m))) ;; (sqlite3:finalize! db) (if keep-going (begin |
︙ |
Modified megatest.scm from [ab8143b2ea] to [2bdb2f5097].
︙ | |||
32 33 34 35 36 37 38 | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | - - - - - - - - - - - - - - - - - - | (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") (include "megatest-fossil-hash.scm") |
︙ | |||
268 269 270 271 272 273 274 275 276 277 278 279 280 281 | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 | + + + + + + + + + + + + + + + + + + + + + + + + | (if (args:get-arg "-version") (begin (print megatest-version) (exit))) (define *didsomething* #f) ;; Overall exit handling setup immediately ;; (if (or (args:get-arg "-process-reap")) ;; (args:get-arg "-runtests") ;; (args:get-arg "-execute") ;; (args:get-arg "-remove-runs") ;; (args:get-arg "-runstep")) (let ((original-exit (exit-handler))) (exit-handler (lambda (#!optional (exit-code 0)) (printf "Preparing to exit with exit code ~A ...\n" exit-code) (for-each (lambda (pid) (handle-exceptions exn #t (let-values (((pid-val exit-status exit-code) (process-wait pid #t))) (if (or (eq? pid-val pid) (eq? pid-val 0)) (begin (printf "Sending signal/term to ~A\n" pid) (process-signal pid signal/term)))))) (process:children #f)) (original-exit exit-code))))) ;; Force default transport to fs ;; (if ;; (and (or (args:get-arg "-list-targets") ;; ;; (args:get-arg "-list-db-targets")) ;; (not (args:get-arg "-transport")) ;; (hash-table-set! args:arg-hash "-transport" "fs")) |
︙ |
Modified process.scm from [8a2775d2d2] to [88799f98f8].
︙ | |||
111 112 113 114 115 116 117 | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | - + | (loop (+ i 1))) (values pid-val exit-status exit-code)))))) ;;====================================================================== ;; MISC PROCESS RELATED STUFF ;;====================================================================== |
︙ |
Modified tests.scm from [5de2830eb7] to [dfe6ddf3ca].
︙ | |||
276 277 278 279 280 281 282 283 284 285 286 287 288 289 | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | + + + | (if (null? tal) #t (loop (car tal)(cdr tal))) #f)))))) (pop-directory) result))))) (define (tests:test-force-state-status! test-id state status) (cdb:test-set-status-state *runremote* test-id status state #f) (mt:process-triggers test-id state status)) ;; Do not rpc this one, do the underlying calls!!! (define (tests:test-set-status! test-id state status comment dat #!key (work-area #f)) (debug:print-info 4 "tests:test-set-status! test-id=" test-id ", state=" state ", status=" status ", dat=" dat) (let* ((db #f) (real-status status) (otherdat (if dat dat (make-hash-table))) |
︙ |
Modified tests/fullrun/config/mt_include_1.config from [32c08be131] to [92ab22bf8a].
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - + - + + | [setup] # exectutable /path/to/megatest |
Modified tests/fullrun/megatest.config from [438c5f6345] to [233f3b9aad].
︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | + | [setup] # Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding # this may save a few milliseconds on launching tests # launchwait no # Use http instead of direct filesystem access # transport http transport fs # If set to "default" the old code is used. Otherwise defaults to 200 or uses # numeric value given. # runqueue 20 |
︙ |
Modified utils/nbfake from [8a5014b010] to [455975d5ec].
1 2 3 4 5 6 7 8 | 1 2 3 4 5 6 7 8 9 10 11 12 | - + - + | #!/bin/bash # ssh localhost "nohup $* > nbfake.log 2> nbfake.err < /dev/null" # Can't always trust $PWD CURRWD=`pwd` if [[ $TARGETHOST == "" ]]; then |
Modified utils/nbfind from [03c58ee4f1] to [02152a07a2].
︙ | |||
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | - + + + | lperc=`echo "100 * $load / $numcpu"|bc` if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=50 else max_load=$MAX_ALLOWED_LOAD fi if [[ $lperc -lt $max_load ]];then |