Overview
Comment: | Wip, getting close ... |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6584-ck5 |
Files: | files | file ages | folders |
SHA1: |
b4e909208951d67738b3cc5f6e2b400a |
User & Date: | matt on 2021-04-06 13:51:29 |
Other Links: | branch diff | manifest | tags |
Context
2021-04-06
| ||
22:53 | Getting still closer but not there yet check-in: 38a3940f9b user: matt tags: v1.6584-ck5 | |
13:51 | Wip, getting close ... check-in: b4e9092089 user: matt tags: v1.6584-ck5 | |
08:45 | Added hostinfo check-in: 5e83a11ff5 user: matt tags: v1.6584-ck5 | |
Changes
Modified adjutant.scm from [7560fecb1c] to [0f2ee22f04].
︙ | ︙ | |||
14 15 16 17 18 19 20 | ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== | | | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;;====================================================================== ;; (declare (unit adjutant)) (module adjutant * (import scheme chicken.base) (import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 md5 message-digest regex srfi-1) (define (adjutant-run) (print "Running the adjutant!")) ) |
Modified archive.scm from [e20dfafc62] to [908fcb316e].
︙ | ︙ | |||
29 30 31 32 33 34 35 | ;; ;;====================================================================== ;; ;;====================================================================== ;; NOT CURRENTLY USED ;; | | | | | | | | | | | | | | | | | | | | | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | ;; ;;====================================================================== ;; ;;====================================================================== ;; NOT CURRENTLY USED ;; ;; (define (archive:main linktree target runname testname itempath options) ;; (let ((testdir (conc linktree "/" target "/" runname "/" testname "/" itempath)) ;; (flavor 'plain) ;; type of machine to run jobs on ;; (maxload 1.5) ;; max allowed load for this work ;; (adisks (archive:get-archive-disks))) ;; ;; get testdir size ;; ;; - hand off du to job mgr ;; (if (and (common:file-exists? testdir) ;; (file-writable? testdir)) ;; (let* ((dused (jobrunner:run-job ;; flavor ;; machine type ;; maxload ;; max allowed load ;; '() ;; prevars - environment vars to set for the job ;; common:get-disk-space-used ;; if a proc call it, if a string it is a unix command ;; (list testdir))) ;; (apath (archive:get-archive testname itempath dused))) ;; (jobrunner:run-job ;; flavor ;; maxload ;; '() ;; archive:run-bup ;; (list testdir apath)))))) ;; Get archive disks from megatest.config ;; (define (archive:get-archive-disks) (let ((section (configf:get-section *configdat* "archive-disks"))) (if section section |
︙ | ︙ |
Modified common.scm from [f20082f15b] to [27221087b7].
︙ | ︙ | |||
173 174 175 176 177 178 179 180 181 182 183 184 185 186 | (define *server-kind-run* (make-hash-table)) (define *home-host* #f) ;; (define *total-non-write-delay* 0) (define *heartbeat-mutex* (make-mutex)) (define *api-process-request-count* 0) (define *max-api-process-requests* 0) (define *server-overloaded* #f) ;; client (define *rmt-mutex* (make-mutex)) ;; remote access calls mutex ;; RPC transport (define *rpc:listener* #f) | > | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | (define *server-kind-run* (make-hash-table)) (define *home-host* #f) ;; (define *total-non-write-delay* 0) (define *heartbeat-mutex* (make-mutex)) (define *api-process-request-count* 0) (define *max-api-process-requests* 0) (define *server-overloaded* #f) (define *writes-total-delay* 0) ;; client (define *rmt-mutex* (make-mutex)) ;; remote access calls mutex ;; RPC transport (define *rpc:listener* #f) |
︙ | ︙ |
Modified ezsteps.scm from [bcc479ae26] to [a411433d05].
︙ | ︙ | |||
33 34 35 36 37 38 39 40 41 42 43 44 45 46 | ;; (include "common_records.scm") ;; (include "key_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") ;; ;; ;;(rmt:get-test-info-by-id run-id test-id) -> testdat ;; TODO: deprecate me in favor of ezsteps.scm ;; (define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat) (let* ((stepname (car ezstep)) ;; do stuff to run the step (stepinfo (cadr ezstep)) ;; (let ((info (cadr ezstep))) | > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | ;; (include "common_records.scm") ;; (include "key_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") ;; ;; ;;(rmt:get-test-info-by-id run-id test-id) -> testdat (define message-window #f) ;; TODO: deprecate me in favor of ezsteps.scm ;; (define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat) (let* ((stepname (car ezstep)) ;; do stuff to run the step (stepinfo (cadr ezstep)) ;; (let ((info (cadr ezstep))) |
︙ | ︙ | |||
261 262 263 264 265 266 267 | (loop (- count 1)))))) (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir) (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps")) ;; if ezsteps was defined then we are sure to have at least one step but check anyway (if (not (> (length ezstepslst) 0)) | > | > | | 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 | (loop (- count 1)))))) (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir) (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps")) ;; if ezsteps was defined then we are sure to have at least one step but check anyway (if (not (> (length ezstepslst) 0)) (if message-window (message-window "ERROR: You can only re-run steps defined via ezsteps") (debug:print 0 *default-log-port* "ERROR: You can only re-run steps defined via ezsteps")) (begin (let loop ((ezstep (car ezstepslst)) (tal (cdr ezstepslst)) (status-sym-so-far 'pass) ;;(runflag #f) (saw-start-step-name #f)) ;; flag used to skip steps when not starting at the beginning (if (or (vector-ref exit-info 1) (equal? (alist-ref 'keep-going the-step-params) 'yes)) (let* ((prev-step-params the-step-params) ;; need to snag this now (stepname (car ezstep)) ;; do stuff to run the step (logpro-used (common:file-exists? (conc test-run-dir "/" stepname ".logpro"))) (stepinfo (cadr ezstep)) (stepparts (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo)) (stepparms (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each (stepcmd (list-ref stepparts 3)) |
︙ | ︙ |
Modified http-transport.scm from [024bffa0c3] to [73ceea083e].
︙ | ︙ | |||
225 226 227 228 229 230 231 | (let loop ((etime (+ (current-seconds) 5))) ;; give up in five seconds (if (> *http-requests-in-progress* 0) (if (> etime (current-seconds)) (begin (thread-sleep! 0.05) (loop etime)) (debug:print-error 0 *default-log-port* "requests still in progress after 5 seconds of waiting. I'm going to pass on cleaning up http connections")) | | | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | (let loop ((etime (+ (current-seconds) 5))) ;; give up in five seconds (if (> *http-requests-in-progress* 0) (if (> etime (current-seconds)) (begin (thread-sleep! 0.05) (loop etime)) (debug:print-error 0 *default-log-port* "requests still in progress after 5 seconds of waiting. I'm going to pass on cleaning up http connections")) (close-idle-connections!))) (set! *http-connections-next-cleanup* (+ (current-seconds) 10)) (mutex-unlock! *http-mutex*)) (define (http-transport:inc-requests-and-prep-to-close-all-connections) (mutex-lock! *http-mutex*) (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*))) |
︙ | ︙ | |||
297 298 299 300 301 302 303 | (list (cons 'key (or server-id "thekey")) (cons 'cmd cmd) (cons 'params sparams)) read-string)) transport: 'http) 0)) ;; added this speculatively ;; Shouldn't this be a call to the managed call-all-connections stuff above? | | | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | (list (cons 'key (or server-id "thekey")) (cons 'cmd cmd) (cons 'params sparams)) read-string)) transport: 'http) 0)) ;; added this speculatively ;; Shouldn't this be a call to the managed call-all-connections stuff above? (close-idle-connections!) (mutex-unlock! *http-mutex*) )) (time-out (lambda () (thread-sleep! 45) (debug:print 0 *default-log-port* "WARNING: send-receive took more than 45 seconds!!") #f)) (th1 (make-thread send-recieve "with-input-from-request")) |
︙ | ︙ | |||
520 521 522 523 524 525 526 | (if (common:low-noise-print 120 "server continuing") (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)) (let ((curr-time (current-seconds))) (handle-exceptions exn (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk? exn=" exn) (if (not *server-overloaded*) | | | 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | (if (common:low-noise-print 120 "server continuing") (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)) (let ((curr-time (current-seconds))) (handle-exceptions exn (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk? exn=" exn) (if (not *server-overloaded*) (set-file-times! server-log-file curr-time curr-time))))) (loop 0 server-state bad-sync-count (current-milliseconds))) (else (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access)) (http-transport:server-shutdown port))))))) (define (http-transport:server-shutdown port) (begin |
︙ | ︙ |
Modified megatest.scm from [c12d8c8b4a] to [be2a53addb].
︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | (include "dbi/dbi.scm") (include "stml2/cookie.scm") (include "stml2/stml2.scm") (include "pkts/pkts.scm") (include "csv-xml/csv-xml.scm") (include "ducttape/ducttape-lib.scm") (include "hostinfo/hostinfo.scm") ;; (include "call-with-environment-variables/call-with-environment-variables.scm") (module megatest-main * (import scheme | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | (include "dbi/dbi.scm") (include "stml2/cookie.scm") (include "stml2/stml2.scm") (include "pkts/pkts.scm") (include "csv-xml/csv-xml.scm") (include "ducttape/ducttape-lib.scm") (include "hostinfo/hostinfo.scm") (include "adjutant.scm") ;; (include "call-with-environment-variables/call-with-environment-variables.scm") (module megatest-main * (import scheme |
︙ | ︙ | |||
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | (prefix sqlite3 sqlite3:) (prefix base64 base64:) address-info csv-abnf directory-utils fmt matchable md5 message-digest queues regex regex-case sql-de-lite stack typed-records s11n sparse-vectors sxml-serializer sxml-modifications system-information z3 | > > | > | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | (prefix sqlite3 sqlite3:) (prefix base64 base64:) address-info csv-abnf directory-utils fmt json matchable md5 message-digest queues regex regex-case sql-de-lite stack typed-records s11n sparse-vectors sxml-serializer sxml-modifications system-information z3 spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing srfi-1 srfi-4 srfi-18 srfi-13 srfi-98 srfi-69 ;; local modules mutils csv-xml ducttape-lib hostinfo adjutant ) ;; (include "common.scm") (include "megatest-version.scm") ;; fake out readline usage of toplevel-command (define (toplevel-command . a) #f) |
︙ | ︙ | |||
172 173 174 175 176 177 178 | ;; (use sparse-vectors) ;; ;; (require-library mutils) ;; copied from egg call-with-environment-variables ;; (define (call-with-environment-variables variables thunk) | | | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | ;; (use sparse-vectors) ;; ;; (require-library mutils) ;; copied from egg call-with-environment-variables ;; (define (call-with-environment-variables variables thunk) ;; @("Sets up environment variable via dynamic-wind which are taken down after thunk." ;; (variables "An alist of the form {{'((\"var\" . \"value\") ...)}}") ;; (thunk "The thunk to execute with a modified environment")) (let ((pre-existing-variables (map (lambda (var-value) (let ((var (car var-value))) (cons var (get-environment-variable var)))) variables))) (dynamic-wind (lambda () (void)) |
︙ | ︙ | |||
691 692 693 694 695 696 697 | (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf) newlogf) logpath-in))) (if (not (directory-exists? log-dir)) (system (conc "mkdir -p " log-dir))) (open-output-file logpath)) (exn () | | | 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 | (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf) newlogf) logpath-in))) (if (not (directory-exists? log-dir)) (system (conc "mkdir -p " log-dir))) (open-output-file logpath)) (exn () (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath-in) (define *didsomething* #t) (exit 1)))) ;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not ;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation ;; where (launch:setup) returns #f? ;; |
︙ | ︙ | |||
2037 2038 2039 2040 2041 2042 2043 | ;; == duplicated == user ;; == duplicated == args:arg-hash)))) ;;====================================================================== ;; Rollup into a run ;;====================================================================== | | | | | | | | | | | 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 | ;; == duplicated == user ;; == duplicated == args:arg-hash)))) ;;====================================================================== ;; Rollup into a run ;;====================================================================== ;; (if (args:get-arg "-rollup") ;; (general-run-call ;; "-rollup" ;; "rollup tests" ;; (lambda (target runname keys keyvals) ;; (runs:rollup-run keys ;; keyvals ;; (or (args:get-arg "-runname")(args:get-arg ":runname") ) ;; user)))) ;;====================================================================== ;; Lock or unlock a run ;;====================================================================== (if (or (args:get-arg "-lock")(args:get-arg "-unlock")) (general-run-call |
︙ | ︙ | |||
2449 2450 2451 2452 2453 2454 2455 | (if (args:get-arg "-mark-incompletes") (begin (if (not (launch:setup)) (begin (debug:print 0 *default-log-port* "Failed to setup, exiting") (exit 1))) | | | 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 | (if (args:get-arg "-mark-incompletes") (begin (if (not (launch:setup)) (begin (debug:print 0 *default-log-port* "Failed to setup, exiting") (exit 1))) (rmt:find-and-mark-incomplete #f) (set! *didsomething* #t))) ;;====================================================================== ;; Update the tests meta data from the testconfig files ;;====================================================================== (if (args:get-arg "-update-meta") |
︙ | ︙ |
Modified tests.scm from [eb7e39eadc] to [ef56b9a810].
︙ | ︙ | |||
907 908 909 910 911 912 913 | (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function (close-output-port oup) ; (set! page (+ 1 page)) (if (> total-runs (* (+ 1 page) pg-size)) (loop (+ 1 page))))) (common:simple-file-release-lock lockfile)) (begin | | | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 | (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function (close-output-port oup) ; (set! page (+ 1 page)) (if (> total-runs (* (+ 1 page) pg-size)) (loop (+ 1 page))))) (common:simple-file-release-lock lockfile)) (begin (debug:print 0 *default-log-port* "Failed to get lock on file outf, lockfile: " lockfile) #f)))) (define (tests:readlines filename) (call-with-input-file filename (lambda (p) (let loop ((line (read-line p)) (result '())) |
︙ | ︙ |