mumax3-server: pay more attention to pre-existing output dir

cmd/mumax3-server/compute.go

@@ -150,7 +150,17 @@ func NewProcess(ID string, gpu int, webAddr string) *Process {
 
 	// Pipe stdout, stderr to log file over httpfs
 	outDir := util.NoExt(inputURL) + ".out"
-	httpfs.Mkdir(outDir)
+	errMkdir := httpfs.Mkdir(outDir)
+	if errMkdir != nil {
+		SetJobError(ID, errMkdir)
+		log.Println("makeProcess", errMkdir)
+		j := JobByName(ID)
+		if j != nil {
+			j.Reque()
+		}
+		return nil
+	}
+
 	out, errD := httpfs.Create(outDir + "/stdout.txt")
 	if errD != nil {
 		SetJobError(ID, errD)

engine/od.go

@@ -4,7 +4,6 @@ package engine
 
 import (
 	"github.com/mumax/3/httpfs"
-	"github.com/mumax/3/util"
 	"strings"
 )
 
@@ -40,9 +39,8 @@ func InitIO(inputfile, od string, force bool) {
 	if force {
 		httpfs.Remove(od)
 	}
-	if err := httpfs.Mkdir(od); err != nil {
-		util.FatalErr(err)
-	}
+
+	_ = httpfs.Mkdir(od)
 
 	initLog()
 }

httpfs/httpfs.go

@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	Logging = true     // enables logging
+	Logging = false    // enables logging
 	wd      = ""       // working directory, see SetWD
 	lock    sync.Mutex // synchronous local FS access to avoid races
 )
@@ -316,7 +316,7 @@ func httpRemove(URL string) error {
 func localMkdir(fname string) error {
 	lock.Lock()
 	defer lock.Unlock()
-	return os.MkdirAll(fname, DirPerm)
+	return os.Mkdir(fname, DirPerm)
 }
 
 func localTouch(fname string) error {

httpfs/util.go

@@ -51,10 +51,6 @@ func MustOpen(URL string) io.ReadCloser {
 	return f
 }
 
-//func Touch(URL string) error {
-//	return Append(URL, []byte{})
-//}
-
 type bufWriter struct {
 	buf *bufio.Writer
 }
@@ -68,7 +64,6 @@ type appendWriter struct {
 	byteCount int64
 }
 
-// TODO: buffer heavily, Flush() on close
 func (w *appendWriter) Write(p []byte) (int, error) {
 	err := AppendSize(w.URL, p, w.byteCount)
 	if err != nil {
@@ -77,8 +72,3 @@ func (w *appendWriter) Write(p []byte) (int, error) {
 	w.byteCount += int64(len(p))
 	return len(p), nil
 }
-
-// TODO: flush
-//func (w *appendWriter) Close() error {
-//return nil
-//}