Overview
Comment: | Moved minutes monitoring from megatest.db to testdat.db |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | test-specific-db |
Files: | files | file ages | folders |
SHA1: |
4f517c55766f455cf95c6e2df5eff0b6 |
User & Date: | matt on 2012-09-27 08:52:52 |
Other Links: | branch diff | manifest | tags |
Context
2012-09-27
| ||
09:30 | Bumped version check-in: 45a92d8798 user: matt tags: test-specific-db | |
08:52 | Moved minutes monitoring from megatest.db to testdat.db check-in: 4f517c5576 user: matt tags: test-specific-db | |
2012-09-26
| ||
22:41 | Have DELETED records removed when a run is completely removed. Added trigger for cleaning cache on getting test info check-in: 44600fe1e6 user: matt tags: test-specific-db | |
Changes
Modified db.scm from [4816e99b5f] to [6ee5676d27].
︙ | ︙ | |||
771 772 773 774 775 776 777 | (begin (sqlite3:for-each-row (lambda (update_time cpuload disk_free run_duration) (db:test-set-cpuload! res cpuload) (db:test-set-diskfree! res disk_free) (db:test-set-run_duration! res run_duration)) tdb | | | 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 | (begin (sqlite3:for-each-row (lambda (update_time cpuload disk_free run_duration) (db:test-set-cpuload! res cpuload) (db:test-set-diskfree! res disk_free) (db:test-set-run_duration! res run_duration)) tdb "SELECT update_time,cpuload,diskfree,run_duration FROM test_rundat ORDER BY id DESC LIMIT 1;") (sqlite3:finalize! tdb)) ;; if the test db is not found what to do? ;; 1. set state to DELETED ;; 2. set status to n/a (begin (db:test-set-state! res "NOT_STARTED") (db:test-set-status! res "n/a"))))) |
︙ | ︙ |
Modified launch.scm from [730aea4080] to [843bb8d015].
︙ | ︙ | |||
102 103 104 105 106 107 108 | (open-run-close set-run-config-vars #f run-id) ;; environment overrides are done *before* the remaining critical envars. (alist->env-vars env-ovrd) (open-run-close set-megatest-env-vars #f run-id) (set-item-env-vars itemdat) (save-environment-as-files "megatest") | | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | (open-run-close set-run-config-vars #f run-id) ;; environment overrides are done *before* the remaining critical envars. (alist->env-vars env-ovrd) (open-run-close set-megatest-env-vars #f run-id) (set-item-env-vars itemdat) (save-environment-as-files "megatest") (open-run-close test-set-meta-info #f test-id run-id test-name itemdat 0) (open-run-close test-set-status! #f test-id "REMOTEHOSTSTART" "n/a" (args:get-arg "-m") #f) (if (args:get-arg "-xterm") (set! fullrunscript "xterm") (if (and fullrunscript (not (file-execute-access? fullrunscript))) (system (conc "chmod ug+x " fullrunscript)))) ;; We are about to actually kick off the test ;; so this is a good place to remove the records for |
︙ | ︙ | |||
252 253 254 255 256 257 258 | ;; (tmpfree (get-df "/tmp"))) (begin ;; (if (not (args:get-arg "-server")) ;; (server:client-setup db)) ;; (if (not cpuload) (begin (debug:print 0 "WARNING: CPULOAD not found.") (set! cpuload "n/a"))) ;; (if (not diskfree) (begin (debug:print 0 "WARNING: DISKFREE not found.") (set! diskfree "n/a"))) (set! kill-job? (open-run-close test-get-kill-request #f test-id)) ;; run-id test-name itemdat)) | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | ;; (tmpfree (get-df "/tmp"))) (begin ;; (if (not (args:get-arg "-server")) ;; (server:client-setup db)) ;; (if (not cpuload) (begin (debug:print 0 "WARNING: CPULOAD not found.") (set! cpuload "n/a"))) ;; (if (not diskfree) (begin (debug:print 0 "WARNING: DISKFREE not found.") (set! diskfree "n/a"))) (set! kill-job? (open-run-close test-get-kill-request #f test-id)) ;; run-id test-name itemdat)) (open-run-close test-set-meta-info #f test-id run-id test-name itemdat minutes) ;; (rdb:test-update-meta-info db test-id minutes cpuload diskfree tmpfree) (if kill-job? (begin (mutex-lock! m) (let* ((pid (vector-ref exit-info 0))) (if (number? pid) (begin |
︙ | ︙ | |||
331 332 333 334 335 336 337 | ) (mutex-unlock! m) ;; (exec-results (cmd-run->list fullrunscript)) ;; (list ">" (conc test-name "-run.log")))) ;; (success exec-results)) ;; (eq? (cadr exec-results) 0))) (debug:print 2 "Output from running " fullrunscript ", pid " (vector-ref exit-info 0) " in work area " work-area ":\n====\n exit code " (vector-ref exit-info 2) "\n" "====\n") ;; (sqlite3:finalize! db) | | | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | ) (mutex-unlock! m) ;; (exec-results (cmd-run->list fullrunscript)) ;; (list ">" (conc test-name "-run.log")))) ;; (success exec-results)) ;; (eq? (cadr exec-results) 0))) (debug:print 2 "Output from running " fullrunscript ", pid " (vector-ref exit-info 0) " in work area " work-area ":\n====\n exit code " (vector-ref exit-info 2) "\n" "====\n") ;; (sqlite3:finalize! db) ;; (sqlite3:finalize! tdb) (if (not (vector-ref exit-info 1)) (exit 4))))))) ;; set up the very basics needed for doing anything here. (define (setup-for-run) ;; would set values for KEYS in the environment here for better support of env-override but ;; have chicken/egg scenario. need to read megatest.config then read it again. Going to |
︙ | ︙ |
Modified tests.scm from [f2110ddf4a] to [b33efa2b90].
︙ | ︙ | |||
400 401 402 403 404 405 406 | (lambda (count) (set! res count)) tdb "SELECT count(id) FROM test_rundat;") res)) 0) | | > < > > | | < < | | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | (lambda (count) (set! res count)) tdb "SELECT count(id) FROM test_rundat;") res)) 0) (define (test-set-meta-info db test-id run-id testname itemdat minutes) (let* ((tdb (db:open-test-db-by-test-id db test-id)) (num-records (test:tdb-get-rundat-count tdb)) (item-path (item-list->path itemdat)) (cpuload (get-cpu-load)) (diskfree (get-df (current-directory)))) (if (eq? (modulo num-records 10) 0) ;; every ten records update central (begin (sqlite3:execute db "UPDATE tests SET cpuload=?,diskfree=? WHERE run_id=? AND testname=? AND item_path=?;" cpuload diskfree run-id testname item-path) (if minutes (sqlite3:execute db "UPDATE tests SET run_duration=? WHERE id=?;" minutes test-id)) (if (eq? num-records 0) (let ((uname (get-uname "-srvpio")) (hostname (get-host-name))) (sqlite3:execute db "UPDATE tests SET uname=?,host=? WHERE run_id=? AND testname=? AND item_path=?;" uname hostname run-id testname item-path))))) (sqlite3:execute tdb "INSERT INTO test_rundat (update_time,cpuload,diskfree,run_duration) VALUES (strftime('%s','now'),?,?,?);" cpuload diskfree minutes))) ;;====================================================================== ;; A R C H I V I N G ;;====================================================================== (define (test:archive db test-id) |
︙ | ︙ |