Overview
Comment: | Join monitor thread in launch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 |
Files: | files | file ages | folders |
SHA1: |
c84bb1b89523c887448e5cbf77396877 |
User & Date: | matt on 2013-09-13 22:56:48 |
Other Links: | branch diff | manifest | tags |
Context
2013-09-17
| ||
08:11 | Temporarily removed condition intended to catch blocking when a prerequisite is in the queue check-in: 3f3d4aaa1e user: matt tags: v1.55 | |
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 | |
Changes
Modified launch.scm from [680b277def] to [a6e72c516e].
︙ | ︙ | |||
351 352 353 354 355 356 357 | (th1 (make-thread monitorjob "monitor job")) (th2 (make-thread runit "run job"))) (set! job-thread th2) (thread-start! th1) (thread-start! th2) (thread-join! th2) (set! keep-going #f) | > | | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | (th1 (make-thread monitorjob "monitor job")) (th2 (make-thread runit "run job"))) (set! job-thread th2) (thread-start! th1) (thread-start! th2) (thread-join! th2) (set! keep-going #f) (thread-join! th1) ;; (thread-sleep! 1) ;; (thread-terminate! th1) ;; Not sure if this is a good idea (thread-sleep! 1) ;; give thread th1 a chance to be done TODO: Verify this is needed. At 0.1 I was getting fail to stop, increased to total of 1.1 sec. (mutex-lock! m) (let* ((item-path (item-list->path itemdat)) (testinfo (cdb:get-test-info-by-id *runremote* test-id))) ;; )) ;; run-id test-name item-path))) ;; Am I completed? (if (member (db:test-get-state testinfo) '("REMOTEHOSTSTART" "RUNNING")) ;; NOTE: It should *not* be REMOTEHOSTSTART but for reasons I don't yet understand it sometimes gets stuck in that state ;; (not (equal? (db:test-get-state testinfo) "COMPLETED")) |
︙ | ︙ |
Modified tests/Makefile from [801e8f7cee] to [da94c6fb9c].
︙ | ︙ | |||
135 136 137 138 139 140 141 | minsetup : cd ..;make && make install mkdir -p mintest/runs mintest/links cd mintest;megatest -stop-server 0 cd mintest;megatest -server - -debug $(DEBUG) > server.log 2> server.log & sleep 3 | | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | minsetup : cd ..;make && make install mkdir -p mintest/runs mintest/links cd mintest;megatest -stop-server 0 cd mintest;megatest -server - -debug $(DEBUG) > server.log 2> server.log & sleep 3 cd mintest;dashboard -rows 18 & cleanprep : ../*.scm Makefile */*.config mkdir -p fullrun/tmp/mt_runs fullrun/tmp/mt_links cd ..;make;make install rm -f */logging.db touch cleanprep |
︙ | ︙ |
Modified tests/fullrun/config/mt_include_1.config from [92ab22bf8a] to [3fe3119991].
1 2 3 4 5 6 7 8 9 10 11 12 | [setup] # exectutable /path/to/megatest max_concurrent_jobs 50 linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links [jobtools] useshell yes # ## launcher launches jobs, the job is managed on the target host ## by megatest, comment out launcher to run local # workhosts localhost hermes # launcher exec nbfake | > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | [setup] # exectutable /path/to/megatest max_concurrent_jobs 50 linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links [jobtools] useshell yes # ## launcher launches jobs, the job is managed on the target host ## by megatest, comment out launcher to run local # workhosts localhost hermes # launcher exec nbfake launcher nbfake # launcher nbfind # launcher nodanggood ## use "xterm -e csi -- " as a launcher to examine the launch environment. ## exit with (exit) ## get a shell with (system "bash") # launcher xterm -e csi -- |
tests/installall/config/megatest.config.dat became a regular file with contents [736a5da885].
tests/installall/config/runconfigs.config.dat became a regular file with contents [3b8f260acb].