Overview
| Comment: | Fixed cleanup-db to do both nfs and tmp dbs. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.80-revolution |
| Files: | files | file ages | folders |
| SHA1: |
05132c1b5d2e85199b77bfb878a8370f |
| User & Date: | mmgraham on 2023-12-14 15:11:24 |
| Other Links: | branch diff | manifest | tags |
Context
|
2023-12-14
| ||
| 15:50 | Merged opportunistic deletion of DELETED tests. check-in: 465e11c224 user: mrwellan tags: v1.80-revolution | |
| 15:11 | Fixed cleanup-db to do both nfs and tmp dbs. check-in: 05132c1b5d user: mmgraham tags: v1.80-revolution | |
|
2023-12-13
| ||
| 15:49 | Improved dashboard performance check-in: b229b3f7b0 user: mrwellan tags: v1.80-revolution | |
Changes
Modified db.scm from [d74d37ec7f] to [22c8afbb7c].
| ︙ | ︙ | |||
634 635 636 637 638 639 640 | #t) (changed ;; (and changed #t) ((and changed *time-to-exit*) ;; last sync #t) (else #f)))) | > | > > > > > > > > < < | 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 |
#t)
(changed ;; (and changed
#t)
((and changed *time-to-exit*) ;; last sync
#t)
(else
#f))))
(if (or dejunk do-cp)
(let* ((start-time (current-milliseconds))
(subdb (or (dbfile:get-subdb dbstruct run-id) (dbfile:init-subdb dbstruct run-id dbfile:db-init-proc)))
(dbdat (or (dbfile:get-dbdat dbstruct run-id) (dbfile:open-db dbstruct run-id dbfile:db-init-proc)))
(mtdb (dbr:subdb-mtdbdat subdb))
;;
;; BUG: -mrw- I think this next line is wrong. run-id should be the path to .mtdb/<runid>.db
;;
(tmpdb (dbfile:open-db dbstruct run-id dbfile:db-init-proc)))
(if dejunk
(begin
(debug:print 0 *default-log-port* "Cleaning nfs DB")
(db:clean-up run-id mtdb)
(debug:print 0 *default-log-port* "Cleaning tmp DB")
(db:clean-up run-id tmpdb)
)
)
(debug:print-info 2 *default-log-port* "delta syncing file: " srcfile ", time diff: " (- time1 time2) " seconds")
(if old2new
(begin
(db:sync-tables (db:sync-all-tables-list
(db:get-keys dbstruct))
#f mtdb tmpdb))
(begin
(db:sync-tables (db:sync-all-tables-list (db:get-keys dbstruct)) #f tmpdb mtdb)))
(hash-table-set! sync-durations (conc srcfile ".db") (- (current-milliseconds) start-time)))
(debug:print-info 2 *default-log-port* "skipping delta sync. " srcfile " is up to date"))))
dbfiles))
data-synced))
;; Sync all changed db's
|
| ︙ | ︙ | |||
1178 1179 1180 1181 1182 1183 1184 | ;; b. If test dir gone, delete the test record ;; 2. Look at run records ;; a. If have tests that are not deleted, set state='unknown' ;; b. .... ;; (define (db:clean-up run-id dbdat) (if run-id | > > | > > > | > | 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 |
;; b. If test dir gone, delete the test record
;; 2. Look at run records
;; a. If have tests that are not deleted, set state='unknown'
;; b. ....
;;
(define (db:clean-up run-id dbdat)
(if run-id
(begin
(debug:print 0 *default-log-port* "Cleaning run DB " run-id)
(db:clean-up-rundb dbdat)
)
(begin
(debug:print 0 *default-log-port* "Cleaning main DB ")
(db:clean-up-maindb dbdat)
)
)
)
;; Clean out old junk and vacuum the database
;;
;; Ultimately do something like this:
|
| ︙ | ︙ | |||
1213 1214 1215 1216 1217 1218 1219 |
"DELETE FROM tests WHERE state='DELETED';"
))))
;; (db:delay-if-busy dbdat)
(sqlite3:with-transaction
db
(lambda ()
(sqlite3:for-each-row (lambda (tot)
| | | | 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 |
"DELETE FROM tests WHERE state='DELETED';"
))))
;; (db:delay-if-busy dbdat)
(sqlite3:with-transaction
db
(lambda ()
(sqlite3:for-each-row (lambda (tot)
(debug:print-info 0 *default-log-port* "Test records count before clean: " tot))
count-stmt)
(map sqlite3:execute statements)
(sqlite3:for-each-row (lambda (tot)
(debug:print-info 0 *default-log-port* "Test records count after clean: " tot))
count-stmt)))
(map sqlite3:finalize! statements)
(sqlite3:finalize! count-stmt)
;; (db:find-and-mark-incomplete db)
;; (db:delay-if-busy dbdat)
(sqlite3:execute db "VACUUM;")))
|
| ︙ | ︙ | |||
1260 1261 1262 1263 1264 1265 1266 |
db
"SELECT id FROM runs WHERE state='deleted';")
;; (db:delay-if-busy dbdat)
(sqlite3:with-transaction
db
(lambda ()
(sqlite3:for-each-row (lambda (tot)
| | | | 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 |
db
"SELECT id FROM runs WHERE state='deleted';")
;; (db:delay-if-busy dbdat)
(sqlite3:with-transaction
db
(lambda ()
(sqlite3:for-each-row (lambda (tot)
(debug:print-info 0 *default-log-port* "Run records count before clean: " tot))
count-stmt)
(map sqlite3:execute statements)
(sqlite3:for-each-row (lambda (tot)
(debug:print-info 0 *default-log-port* "Run records count after clean: " tot))
count-stmt)))
(map sqlite3:finalize! statements)
(sqlite3:finalize! count-stmt)
;; (db:find-and-mark-incomplete db)
;; (db:delay-if-busy dbdat)
(sqlite3:execute db "VACUUM;")
dead-runs))
|
| ︙ | ︙ |