Overview
| Comment: | Couple missing changes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
fbecacd30f01377f4e1d9f518cdf50eb |
| User & Date: | matt on 2014-12-18 22:56:59 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-12-22
| ||
| 23:18 | Most of the routines for storing archive info in place check-in: cee2df01ce user: matt tags: v1.60 | |
|
2014-12-18
| ||
| 22:56 | Couple missing changes check-in: fbecacd30f user: matt tags: v1.60 | |
|
2014-12-17
| ||
| 23:21 | Added part of archiving skeleton functions check-in: da57e60521 user: matt tags: v1.60 | |
Changes
Modified archive.scm from [b063115914] to [dd81930b93].
| ︙ | ︙ | |||
74 75 76 77 78 79 80 81 82 83 |
;;
(define (archive:allocate-new-archive-block run-area-home testsuite-name dneeded)
(let* ((adisks (archive:get-archive-disks))
(best-disk (common:get-disk-with-most-free-space adisks dneeded)))
(if best-disk
(let* ((bdisk-name (car best-disk))
(bdisk-path (cdr best-disk))
(bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path)))
(archive-name (conc (time->string (seconds->local-time (current-seconds)) "%Y")
"_q" (seconds->quarter sec) "/"
| > | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
;;
(define (archive:allocate-new-archive-block run-area-home testsuite-name dneeded)
(let* ((adisks (archive:get-archive-disks))
(best-disk (common:get-disk-with-most-free-space adisks dneeded)))
(if best-disk
(let* ((bdisk-name (car best-disk))
(bdisk-path (cdr best-disk))
(area-key (substring (message-digest-string (md5-primitive) run-area-home) 0 5))
(bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path)))
(archive-name (conc (time->string (seconds->local-time (current-seconds)) "%Y")
"_q" (seconds->quarter sec) "/"
testsuite-name "_" area-key))
(archive-path (conc bdisk-path "/" archive-name))
(block-id (rmt:archive-register-block-name bdisk-id archive-path))
(allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key)))
(if (and block-id allocation-id)
archive-path
#f))
#f)))
;; archive - run bup
;;
|
| ︙ | ︙ |
Modified db.scm from [3172f4a26d] to [bf4f980861].
| ︙ | ︙ | |||
815 816 817 818 819 820 821 |
target TEXT DEFAULT '',
name TEXT DEFAULT '',
testpatt TEXT DEFAULT '',
keylock TEXT,
params TEXT,
creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
execution_time TIMESTAMP);")
| | | 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 |
target TEXT DEFAULT '',
name TEXT DEFAULT '',
testpatt TEXT DEFAULT '',
keylock TEXT,
params TEXT,
creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
execution_time TIMESTAMP);")
;; archive disk areas, cached info from [archive-disks]
(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks (
id INTEGER PRIMARY KEY,
archive_area_name TEXT,
disk_path TEXT,
last_df INTEGER DEFAULT -1,
last_df_time TIMESTAMP DEFAULT (strftime('%s','now')),
creation_time TIMESTAMP DEFAULT (strftime('%','now')));")
|
| ︙ | ︙ |