Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -667,11 +667,24 @@
 ;;======================================================================
 
 (define (common:get-disk-space-used fpath)
   (with-input-from-pipe (conc "/usr/bin/du -s " fpath) read))
 
+;; given path get free space, allows override in [setup]
+;; with free-space-script /path/to/some/script.sh
+;;
 (define (get-df path)
+  (if (configf:lookup *configdat* "setup" "free-space-script")
+      (with-input-from-pipe 
+       (configf:lookup *configdat* "setup" "free-space-script")
+       (lambda ()
+	 (let ((res (read-line)))
+	   (if (string? res)
+	       (string->number res)))))
+      (get-unix-df path)))
+
+(define (get-unix-df path)
   (let* ((df-results (process:cmd-run->list (conc "df " path)))
 	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
 	 (freespc    #f))
     ;; (write df-results)
     (for-each (lambda (l)
@@ -680,10 +693,39 @@
 		      (let ((newval (string->number (cadr match))))
 			(if (number? newval)
 			    (set! freespc newval))))))
 	      (car df-results))
     freespc))
+
+;; check space in dbdir
+;; returns: ok/not dbspace required-space
+;;
+(define (common:check-db-dir-space)
+  (let* ((dbdir    (db:get-dbdir))
+	 (dbspace  (if (directory? dbdir)
+		       (get-df dbdir)
+		       0))
+	 (required (string->number 
+		    (or (configf:lookup *configdat* "setup" "dbdir-space-required")
+			"100000"))))
+    (list (> dbspace required)
+	  dbspace
+	  required
+	  dbdir)))
+
+;; check available space in dbdir, exit if insufficient
+;;
+(define (common:check-db-dir-and-exit-if-insufficient)
+  (let* ((spacedat (common:check-db-dir-space))
+	 (is-ok    (car spacedat))
+	 (dbspace  (cadr spacedat))
+	 (required (caddr spacedat))
+	 (dbdir    (cadddr spacedat)))
+    (if (not is-ok)
+	(begin
+	  (debug:print 0 "ERROR: Insufficient space in " dbdir ", require " required ", have " dbspace  ", exiting now.")
+	  (exit 1)))))
   
 ;; paths is list of lists ((name path) ... )
 ;;
 (define (common:get-disk-with-most-free-space disks minsize)
   (let ((best     #f)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -145,12 +145,11 @@
 
 ;; NB// #f => return dbdir only
 ;;      (was planned to be;  zeroth db with name=main.db)
 ;;
 (define (db:dbfile-path run-id)
-  (let* ((dbdir           (or (configf:lookup *configdat* "setup" "dbdir")
-			      (conc (configf:lookup *configdat* "setup" "linktree") "/.db")))
+  (let* ((dbdir           (db:get-dbdir))
 	 (fname           (if run-id
 			      (if (eq? run-id 0) "main.db" (conc run-id ".db"))
 			      #f)))
     (handle-exceptions
      exn
@@ -159,10 +158,14 @@
        (exit 1))
      (if (not (directory? dbdir))(create-directory dbdir #t)))
     (if fname
 	(conc dbdir "/" fname)
 	dbdir)))
+
+(define (db:get-dbdir)
+  (or (configf:lookup *configdat* "setup" "dbdir")
+      (conc (configf:lookup *configdat* "setup" "linktree") "/.db")))
 	       
 (define (db:set-sync db)
   (let ((syncprag (configf:lookup *configdat* "setup" "sychronous")))
     (sqlite3:execute db (conc "PRAGMA synchronous = " (or syncprag 1) ";"))))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -751,12 +751,12 @@
     (if disks 
 	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
 	  (if res
 	      (cdr res)
 	      (begin
-		(if (common:low-noise-print 20 "no valid disks")
-		    (debug:print 0 "ERROR: No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists!"))
+		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
+		    (debug:print 0 "ERROR: No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
 		(exit 1)))))))
 
 ;; Desired directory structure:
 ;;
 ;;  <linkdir> - <target> - <testname> -.

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -183,19 +183,23 @@
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 (tdbdat             (tasks:open-db))
 	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
 			       (if x (string->number x) #f))))
 
+    ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
+    ;; this will reduce issues in database corruption
+    (common:check-db-dir-and-exit-if-insufficient)
+    
     ;; override the number of reruns from the configs
     (if (and config-reruns
 	     (> run-count config-reruns))
 	(set! run-count config-reruns))
     
     (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
-		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
+		    y ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (set! *time-to-exit* #t)
 		     (print "Received signal " signum ", cleaning up before exit. Please wait...")
 		     (let ((th1 (make-thread (lambda ()
 					       (let ((tdbdat (tasks:open-db)))
 						 (rmt:tasks-set-state-given-param-key task-key "killed"))