Overview
Comment: | Several fixes for merge caused issues. made loadrunner more agressive |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
d55a2c061d26fcc89f420b7ab1850a08 |
User & Date: | mrwellan on 2014-07-23 09:59:50 |
Other Links: | branch diff | manifest | tags |
Context
2014-07-23
| ||
11:04 | Fixed couple queries with problems due to the rmt host mechanism. Made loadrunner more aggressive still check-in: 92f6380e10 user: mrwellan tags: v1.60 | |
09:59 | Several fixes for merge caused issues. made loadrunner more agressive check-in: d55a2c061d user: mrwellan tags: v1.60 | |
00:59 | Missed a conversion from setup-for-run to launch:setup-for-run check-in: 36ce1881c0 user: matt tags: v1.60 | |
Changes
Modified api.scm from [6d4738c6c4] to [dd5a58c49b].
︙ | ︙ | |||
38 39 40 41 42 43 44 | ;; '(#t "exit process started"))) ;; KEYS ((get-key-val-pairs) (apply db:get-key-val-pairs dbstruct params)) ((get-keys) (db:get-keys dbstruct)) ;; TESTS | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | ;; '(#t "exit process started"))) ;; KEYS ((get-key-val-pairs) (apply db:get-key-val-pairs dbstruct params)) ((get-keys) (db:get-keys dbstruct)) ;; TESTS ((test-toplevel-num-items) (apply db:test-toplevel-num-items dbstruct params)) ((get-test-info-by-id) (apply db:get-test-info-by-id dbstruct params)) ((test-get-rundir-from-test-id) (apply db:test-get-rundir-from-test-id dbstruct params)) ((test-set-state-status-by-id) (apply db:test-set-state-status-by-id dbstruct params)) ((get-count-tests-running) (apply db:get-count-tests-running dbstruct params)) ((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params)) ((delete-test-records) (apply db:delete-test-records dbstruct params)) ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params)) |
︙ | ︙ |
Modified db.scm from [be40347815] to [272f470f78].
︙ | ︙ | |||
1811 1812 1813 1814 1815 1816 1817 | (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) (db:get-db dbstruct run-id) tstsqry) res)) | | | | 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 | (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) (db:get-db dbstruct run-id) tstsqry) res)) (define (db:test-toplevel-num-items dbstruct run-id testname) (let ((res 0)) (sqlite3:for-each-row (lambda (num-items) (set! res num-items)) (db:get-db dbstruct run-id) "SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state NOT IN ('DELETED');" run-id testname) res)) ;;====================================================================== ;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS |
︙ | ︙ |
Modified rmt.scm from [d2c68a599e] to [0fc94cf8d5].
︙ | ︙ | |||
187 188 189 190 191 192 193 194 195 196 197 198 199 200 | (define (rmt:delete-test-records run-id test-id) (rmt:send-receive 'delete-test-records run-id (list run-id test-id))) (define (rmt:test-set-status-state run-id test-id status state msg) (rmt:send-receive 'test-set-status-state run-id (list run-id test-id status state msg))) ;; (define (rmt:get-previous-test-run-record run-id test-name item-path) ;; (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path))) (define (rmt:get-matching-previous-test-run-records run-id test-name item-path) (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path))) (define (rmt:test-get-logfile-info run-id test-name) | > > > | 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | (define (rmt:delete-test-records run-id test-id) (rmt:send-receive 'delete-test-records run-id (list run-id test-id))) (define (rmt:test-set-status-state run-id test-id status state msg) (rmt:send-receive 'test-set-status-state run-id (list run-id test-id status state msg))) (define (rmt:test-toplevel-num-items run-id test-name) (rmt:send-receive 'test-toplevel-num-items run-id (list run-id test-name))) ;; (define (rmt:get-previous-test-run-record run-id test-name item-path) ;; (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path))) (define (rmt:get-matching-previous-test-run-records run-id test-name item-path) (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path))) (define (rmt:test-get-logfile-info run-id test-name) |
︙ | ︙ |
Modified runs.scm from [4d9e155bfe] to [a406ea3705].
︙ | ︙ | |||
1379 1380 1381 1382 1383 1384 1385 | (run-dir ;;(filedb:get-path *fdb* ;; (rmt:sdb-qry 'getid (db:test-get-rundir new-test-dat)) ;; ) ;; run dir is from the link tree (test-state (db:test-get-state new-test-dat)) (test-fulln (db:test-get-fullname new-test-dat)) (uname (db:test-get-uname new-test-dat)) (toplevel-with-children (and (db:test-get-is-toplevel test) | | | 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 | (run-dir ;;(filedb:get-path *fdb* ;; (rmt:sdb-qry 'getid (db:test-get-rundir new-test-dat)) ;; ) ;; run dir is from the link tree (test-state (db:test-get-state new-test-dat)) (test-fulln (db:test-get-fullname new-test-dat)) (uname (db:test-get-uname new-test-dat)) (toplevel-with-children (and (db:test-get-is-toplevel test) (> (rmt:test-toplevel-num-items run-id test-name) 0)))) (case action ((remove-runs) ;; if the test is a toplevel-with-children issue an error and do not remove (if toplevel-with-children (begin (debug:print 0 "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests") (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1)) |
︙ | ︙ | |||
1493 1494 1495 1496 1497 1498 1499 | (delete-directory run-dir))) (if run-dir (debug:print 0 "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink") (debug:print 0 "NOTE: the run dir for this test is undefined. Test may have already been deleted.")) )) ;; Only delete the records *after* removing the directory. If things fail we have a record (if (not remove-data-only) | | | 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 | (delete-directory run-dir))) (if run-dir (debug:print 0 "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink") (debug:print 0 "NOTE: the run dir for this test is undefined. Test may have already been deleted.")) )) ;; Only delete the records *after* removing the directory. If things fail we have a record (if (not remove-data-only) (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))) ;;====================================================================== ;; Routines for manipulating runs ;;====================================================================== ;; Since many calls to a run require pretty much the same setup ;; this wrapper is used to reduce the replication of code |
︙ | ︙ |
Name change from tests/simplerun/tests/test2/step1.sh.sh to tests/simplerun/tests/test2/step1.sh.
Name change from tests/simplerun/tests/test2/step2.sh.sh to tests/simplerun/tests/test2/step2.sh.
Modified utils/loadrunner from [ab4b5b8ca7] to [45b4b32042].
︙ | ︙ | |||
43 44 45 46 47 48 49 | numcpu=2 fi # NB// max_load is in units of percent. # lperc=$(echo "100 * $load / $numcpu"|bc) lperc2=$(echo "100 * $load2 / $numcpu"|bc) | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | numcpu=2 fi # NB// max_load is in units of percent. # lperc=$(echo "100 * $load / $numcpu"|bc) lperc2=$(echo "100 * $load2 / $numcpu"|bc) let "lperc2adj=$lperc2 + $numcpu" if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=100 else max_load=$MAX_ALLOWED_LOAD fi lfile=/tmp/loadrunner-$USER.lockfile |
︙ | ︙ |