mumax3-server: use stateless httpfs

cmd/mumax3-server/compute.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"fmt"
+	"github.com/mumax/3/httpfs"
+	"github.com/mumax/3/util"
+	"io"
 	"log"
 	"os/exec"
 	"strings"
 	"time"
-
-	"github.com/mumax/3/httpfs"
-	"github.com/mumax/3/util"
 )
 
 // Runs a compute service on this node, if GPUs are available.
@@ -20,7 +20,7 @@ func (n *Node) RunComputeService() {
 		return
 	}
 
-	// stack of available GPU numbers
+	// queue of available GPU numbers
 	idle := make(chan int, len(n.GPUs))
 	for i := range n.GPUs {
 		idle <- i
@@ -50,7 +50,7 @@ func (n *Node) RunComputeService() {
 			n.unlock()
 
 			status := runJob(job)
-			n.FSServer.CloseAll(JobOutputDir(JobInputFile(job.URL)))
+			//n.FSServer.CloseAll(JobOutputDir(JobInputFile(job.URL)))
 
 			// remove from "running" list
 			n.lock()
@@ -110,7 +110,7 @@ func (n *Node) KillJob(url string) error {
 }
 
 // prepare exec.Cmd to run mumax3 compute process
-func makeProcess(inputURL string, gpu int, webAddr string) (*exec.Cmd, *httpfs.File) {
+func makeProcess(inputURL string, gpu int, webAddr string) (*exec.Cmd, io.WriteCloser) {
 	// prepare command
 	command := *flag_mumax
 	gpuFlag := fmt.Sprint(`-gpu=`, gpu)
@@ -120,14 +120,9 @@ func makeProcess(inputURL string, gpu int, webAddr string) (*exec.Cmd, *httpfs.F
 	cmd := exec.Command(command, gpuFlag, httpFlag, cacheFlag, forceFlag, inputURL)
 
 	// Pipe stdout, stderr to log file over httpfs
-	fs, errFS := httpfs.Dial("http://" + JobHost(inputURL) + "/fs")
-	if errFS != nil {
-		log.Println(errFS)
-		return nil, nil
-	}
 	outDir := util.NoExt(JobInputFile(inputURL)) + ".out"
-	fs.Mkdir(outDir, 0777)
-	out, errD := fs.Create(outDir + "/stdout.txt")
+	httpfs.Mkdir(outDir)
+	out, errD := httpfs.Create(outDir + "/stdout.txt")
 	if errD != nil {
 		log.Println(errD)
 		return nil, nil

cmd/mumax3-server/job.go

@@ -1,17 +1,17 @@
 package main
 
 import (
+	"github.com/mumax/3/util"
 	"net/url"
 	"os/exec"
 	"strings"
 	"time"
-
-	"github.com/mumax/3/util"
 )
 
 // compute Job
 type Job struct {
-	URL       string    // URL of the input file, e.g., http://hostname/fs/user/inputfile.mx3
+	URL string // URL of the input file, e.g., http://hostname/fs/user/inputfile.mx3
+	// all of this is cache:
 	outputURL string    // URL of the output directory, access via OutputURL()
 	Node      string    // Address of the node that runs/ran this job, if any. E.g.: computenode2:35360
 	GPU       int       // GPU number on the compute node that runs/ran this job, if any
@@ -47,7 +47,9 @@ func (j *Job) Path() string {
 	return j.URL[len("http://"):]
 }
 
-func NewJob(URL string) Job { return Job{URL: URL} }
+func NewJob(URL string) Job {
+	return Job{URL: URL}
+}
 
 // Returns how long this job has been running
 func (j *Job) Runtime() time.Duration {

cmd/mumax3-server/main.go

@@ -42,7 +42,6 @@ func main() {
 
 	node = &Node{
 		Addr:         laddr,
-		RootDir:      "./",
 		upSince:      time.Now(),
 		MumaxVersion: DetectMumax(),
 		GPUs:         DetectGPUs(),
@@ -57,8 +56,7 @@ func main() {
 	http.HandleFunc("/call/", node.HandleRPC)
 	http.HandleFunc("/do/", node.HandleHumanRPC)
 	http.HandleFunc("/", node.HandleStatus)
-	node.FSServer = httpfs.NewServer(node.RootDir, "/fs/")
-	http.Handle("/fs/", node.FSServer)
+	httpfs.Handle()
 
 	go func() {
 		log.Println("serving at", laddr)

cmd/mumax3-server/node.go

@@ -5,16 +5,12 @@ import (
 	"reflect"
 	"sync"
 	"time"
-
-	"github.com/mumax/3/httpfs"
 )
 
 type Node struct {
 	Addr         string // canonical (unique) address of node, read-only
-	RootDir      string // httpfs storage root
 	MumaxVersion string
 	upSince      time.Time
-	FSServer     *httpfs.Server
 
 	// compute service
 	GPUs        []GPU

cmd/mumax3-server/que.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"math"
-	"path"
 	"strings"
 	"time"
 )
@@ -76,12 +75,12 @@ func (n *Node) AddJob(fname string) {
 	defer n.unlock()
 	//log.Println("Push job:", fname)
 
-	if path.IsAbs(fname) {
-		if !strings.HasPrefix(fname, n.RootDir) {
-			panic("AddJob " + fname + ": not in root: " + n.RootDir) // TODO: handle gracefully
-		}
-		fname = fname[len(n.RootDir):] // strip root prefix
-	}
+	//	if path.IsAbs(fname) {
+	//		if !strings.HasPrefix(fname, n.RootDir) {
+	//			panic("AddJob " + fname + ": not in root: " + n.RootDir) // TODO: handle gracefully
+	//		}
+	//		fname = fname[len(n.RootDir):] // strip root prefix
+	//	}
 
 	split := strings.Split(fname, "/")
 	first := ""

cmd/mumax3-server/status.go

@@ -126,11 +126,7 @@ Uptime: {{.Uptime}} <br/>
 </p>
 
 <h2>HTTPFS service</h2><p>
-<b>Storage root:</b> <a href="http://{{.Addr}}/fs/">{{.RootDir}}</a>
-<br/><b>Open Files:</b><br/>
-{{range .FSServer.LsOF}}
-	{{.}}<br/>
-{{end}}
+	:-)
 </p>
 
 

httpfs/lockserver.go

@@ -54,7 +54,6 @@ func (l *LockServer) Lock(owner, key string) (ok bool) {
 		l.leases[key] = &lease{owner: owner, t: now}
 		return true
 	}
-
 }
 
 // remove expired leases. a run is linear in the total number of leases,