Index: rmt.scm ================================================================== --- rmt.scm +++ rmt.scm @@ -94,17 +94,19 @@ (assert *toppath* "FATAL: rmt:send-receive called with *toppath* not set.") (let* ((areapath *toppath*) ;; TODO - resolve from dbstruct to be compatible with multiple areas (readonly-mode (rmtmod:calc-ro-mode ttdat *toppath*)) (testsuite (common:get-testsuite-name)) (dbfname (conc (dbfile:run-id->dbnum run-id)".db")) - (dbdir (conc areapath "/.mtdb"))) - (if (and (not *journal-stats*) + (dbdir (conc areapath "/.mtdb")) + (journal-check #f)) ;; disabling journal check for now, since journal files are only possible on the NFS dbs. + + (if (and journal-check (not *journal-stats*) (file-exists? dbdir)) (tt:start-stats dbdir)) ;; fixme - find the right call to get the db directory ;; check the load on dbfname and add some delay using a droop curve of sorts - (if *journal-stats* + (if (and journal-check *journal-stats*) (let* ((load (tt:get-journal-stats dbfname))) (if (> load 0.1) ;; start activating delay at 10% journal load time (let ((dely (* 50 (* load load)))) ;; 100% journal time=50sec delay (debug:print 0 *default-log-port* "Journal load "load" on "dbfname" delaying queries "dely"s.") (thread-sleep! dely))))) Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -1147,11 +1147,11 @@ (keyvals (runs:dat-keyvals runsdat)) (run-info (runs:dat-run-info runsdat)) (all-tests-registry (runs:dat-all-tests-registry runsdat)) (run-limits-info (runs:dat-can-run-more-tests runsdat)) ;; (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running - (have-resources (and (if *journal-stats* + (have-resources (and #; (if *journal-stats* (let* ((dbfname (conc (dbfile:run-id->dbnum run-id) ".db")) (load (tt:get-journal-stats dbfname))) (if (> load 0.1) ;; dbs too busy to start more tests