Megatest

Check-in [ad4842a081]
Login
Overview
Comment:fix to archive save-remove
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65
Files: files | file ages | folders
SHA1: ad4842a081993c0696e699425c9a22f4483e6194
User & Date: pjhatwal on 2020-07-29 16:36:17
Other Links: branch diff | manifest | tags
Context
2020-07-29
17:05
removed comments check-in: a2a5172659 user: pjhatwal tags: v1.65
16:36
fix to archive save-remove check-in: ad4842a081 user: pjhatwal tags: v1.65
2020-07-28
15:51
Do not exit on issues creating link tree. Continue on. If the links were not properly removed let's fix the removal process rather than bandaid here. check-in: e49d32d625 user: mrwellan tags: v1.65, v1.6557
Changes

Modified archive.scm from [212cc6c596] to [1acc296954].

183
184
185
186
187
188
189
190

191
192
193
194
195
196
197
198
199
183
184
185
186
187
188
189

190


191
192
193
194
195
196
197







-
+
-
-







				     (substring test-physical-path
						0
						partial-path-index)
				     #f))
	      ;; we need our archive dir checked for every test to enable folks who want to store other ways.
	      (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name))
	      (archive-dir  (if archive-info (cdr archive-info) #f))
	      (archive-id   (if archive-info (car archive-info) -1))
	      (archive-id   (if archive-info (car archive-info) -1)))

	      )
	 
	 (if (not archive-dir) ;; no archive disk found, this is fatal
	     (begin
	       (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least "
			    min-space " MB space to the [archive-disks] section of megatest.config")
	       (debug:print 0 *default-log-port* "       use [archive] minspace to specify minimum available space")
	       (debug:print 0 *default-log-port* "   disks: "
309
310
311
312
313
314
315

316

317
318





319
320
321
322
323
324
325
307
308
309
310
311
312
313
314
315
316


317
318
319
320
321
322
323
324
325
326
327
328







+

+
-
-
+
+
+
+
+







		    run-dir: source-dir)))
	       (hash-table-ref test-groups test-base))))
	   ;; (mutex-unlock! bup-mutex)
	   (for-each
	    (lambda (test-dat)
	      (let ((test-id           (db:test-get-id        test-dat))
		    (run-id            (db:test-get-run_id    test-dat)))
                 (debug:print-info 0 *default-log-port* "|"archive-command"|")
		(rmt:test-set-archive-block-id run-id test-id archive-id)
                (debug:print-info 0 *default-log-port* "|"archive-command"|" (member (symbol->string archive-command) '("save-remove")) (string? archive-command))
		(if (member archive-command '("save-remove"))
		    (runs:remove-test-directory test-dat 'archive-remove))))

		(if (member (symbol->string archive-command) '("save-remove"))
                    (begin 
                     (debug:print-info 0 *default-log-port* "remove testdat")
		    (runs:remove-test-directory test-dat 'archive-remove)))))
	    (hash-table-ref test-groups test-base)))))
       (hash-table-keys disk-groups))
    #t))

(define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex)  ;; move the getting of archive space down into the below block so that a single run can 
  ;; allocate as needed should a disk fill up
  ;;

Modified megatest-version.scm from [282b937dda] to [5d53cbbe46].

16
17
18
19
20
21
22
23

16
17
18
19
20
21
22

23







-
+
;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.

;; Always use two or four digit decimal
;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..

(declare (unit megatest-version))

(define megatest-version 1.6556)
(define megatest-version 1.6557)

Modified mtut.scm from [fe7848b43e] to [0bb9309c94].

229
230
231
232
233
234
235

236
237
238
239
240
241
242
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243







+







    ("-log"             . #f)
    ("-override-user"   . #f)
    ("-msg"             . M)
    ("-start-dir"       . S)
    ("-set-vars"        . v)
    ("-config"          . h)
    ("-time-out"        . u)
    ("-archive"         . b)
    ))
(define *switch-keys*
  '(
    ("-h"               . #f)
    ("-help"            . #f)
    ("--help"           . #f)
    ("-manual"          . #f)
256
257
258
259
260
261
262
263

264
265
266
267
268
269
270
257
258
259
260
261
262
263

264
265
266
267
268
269
270
271







-
+







    (rerun-clean . "-rerun-clean")
    (rerun-all   . "-rerun-all")
    (kill-run    . "-kill-runs")
    (kill-rerun  . "-kill-rerun")
    (lock        . "-lock")
    (unlock      . "-unlock")
    (sync        . "")
    (archive     . "-archive")
    (archive     . "")
    (set-ss      . "-set-state-status")
    (remove      . "-remove-runs")))

;; manually keep this list updated from the keys to
;; the case *action* near the end of this file.
(define *other-actions*
  '(run remove rerun set-ss archive kill list