Overview
| Comment: | Increased retries in client:start to 100, minor edits? |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
18d165c8c74aee70c20a8c24e5854c25 |
| User & Date: | matt on 2014-03-29 19:11:14 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-03-30
| ||
| 01:10 | Merged f8e4 from branch v1.55 into v1.60 check-in: bc0f8a61c7 user: matt tags: v1.60 | |
| 01:07 | Merge of v1.55 into v1.60 but too many conflicts, saving on branch confict-merge-v1.60 Closed-Leaf check-in: 70e753f237 user: matt tags: confict-merge-v1.60 | |
|
2014-03-29
| ||
| 19:11 | Increased retries in client:start to 100, minor edits? check-in: 18d165c8c7 user: matt tags: v1.60 | |
|
2014-03-25
| ||
| 01:36 | Trial setting of state/status on dropped tests check-in: 20e648eeb2 user: matt tags: v1.55 | |
| 00:48 | Merged v1.55 to v1.60 check-in: bf0c9fc67e user: matt tags: v1.60 | |
Changes
Modified client.scm from [560f4f63e6] to [41a35607ca].
| ︙ | ︙ | |||
51 52 53 54 55 56 57 | ;; 2. We are a run tests, list runs or other interactive process and we must figure out ;; *transport-type* and *runremote* from the monitor.db ;; ;; client:setup ;; ;; lookup_server, need to remove *runremote* stuff ;; | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 |
;; 2. We are a run tests, list runs or other interactive process and we must figure out
;; *transport-type* and *runremote* from the monitor.db
;;
;; client:setup
;;
;; lookup_server, need to remove *runremote* stuff
;;
(define (client:setup run-id #!key (remaining-tries 100) (failed-connects 0))
(debug:print-info 0 "client:setup remaining-tries=" remaining-tries)
(if (<= remaining-tries 0)
(begin
(debug:print 0 "ERROR: failed to start or connect to server for run-id " run-id)
(exit 1))
(let ((host-info (hash-table-ref/default *runremote* run-id #f)))
(if host-info
|
| ︙ | ︙ |
Modified mt.scm from [572bb22a2a] to [e1588608e9].
| ︙ | ︙ | |||
107 108 109 110 111 112 113 |
(if (null? tests)
tests
(begin
(debug:print-info 1 "Discarding tests from " tests " that are waiting on " failed-test)
(let loop ((testn (car tests))
(remt (cdr tests))
(res '()))
| | > > > | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 |
(if (null? tests)
tests
(begin
(debug:print-info 1 "Discarding tests from " tests " that are waiting on " failed-test)
(let loop ((testn (car tests))
(remt (cdr tests))
(res '()))
(let* ((test-dat (hash-table-ref/default test-records testn (vector #f #f '())))
(waitons (vector-ref test-dat 2)))
;; (print "mt:discard-blocked-tests run-id: " run-id " failed-test: " failed-test " testn: " testn " with waitons: " waitons)
(if (null? remt)
(let ((new-res (reverse res)))
;; (print " new-res: " new-res)
new-res)
(loop (car remt)
(cdr remt)
(if (member failed-test waitons)
(begin
(debug:print 0 "Discarding test " testn "(" test-dat ") due to " failed-test)
res)
(cons testn res)))))))))
;;======================================================================
;; T R I G G E R S
;;======================================================================
(define (mt:process-triggers run-id test-id newstate newstatus)
|
| ︙ | ︙ |
Modified runs.scm from [47a5114d4b] to [88c42814b9].
| ︙ | ︙ | |||
459 460 461 462 463 464 465 466 467 468 469 470 471 472 | (set! give-up #t))) prereqstrs) (if (and give-up (not (and (null? tal)(null? reg)))) (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records)) (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records))) (debug:print 1 "WARNING: test " hed " has discarded prerequisites, removing it from the queue") (if (and (null? trimmed-tal) (null? trimmed-reg)) #f (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull) (runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull) (runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull) reruns))) | > > > > | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | (set! give-up #t))) prereqstrs) (if (and give-up (not (and (null? tal)(null? reg)))) (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records)) (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records))) (debug:print 1 "WARNING: test " hed " has discarded prerequisites, removing it from the queue") (let ((test-id (rmt:get-test-id run-id hed ""))) (mt:test-set-state-status-by-id test-id "DEQUED" "PREQ_FAIL" "Failed to run due to failed prerequisites")) (if (and (null? trimmed-tal) (null? trimmed-reg)) #f (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull) (runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull) (runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull) reruns))) |
| ︙ | ︙ |