maxTime flag propagates to Bacalhau Job.Spec.Timeout (#636)

labdao · Sep 7, 2023 · 273161c · 273161c
1 parent e6cffcd
commit 273161c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -31,7 +31,7 @@ var upgradeCmd = &cobra.Command{
 }
 
 const (
-	CurrentPlexVersion = "v0.10.2"
+	CurrentPlexVersion = "v0.10.3"
 	ReleaseURL         = "https://api.github.com/repos/labdao/plex/releases/latest"
 	ToolsURL           = "https://api.github.com/repos/labdao/plex/contents/tools?ref=main"
 )

diff --git a/internal/bacalhau/bacalhau.go b/internal/bacalhau/bacalhau.go
@@ -27,7 +27,7 @@ func GetBacalhauApiHost() string {
 	}
 }
 
-func CreateBacalhauJob(cid, container, cmd string, memory int, gpu, network bool, annotations []string) (job *model.Job, err error) {
+func CreateBacalhauJob(cid, container, cmd string, maxTime, memory int, gpu, network bool, annotations []string) (job *model.Job, err error) {
 	job, err = model.NewJobWithSaneProductionDefaults()
 	if err != nil {
 		return nil, err
@@ -37,6 +37,7 @@ func CreateBacalhauJob(cid, container, cmd string, memory int, gpu, network bool
 	job.Spec.Publisher = model.PublisherIpfs
 	job.Spec.Docker.Entrypoint = []string{"/bin/bash", "-c", cmd}
 	job.Spec.Annotations = annotations
+	job.Spec.Timeout = float64(maxTime) * 60
 
 	// had problems getting selector to work in bacalhau v0.28
 	var selectorLabel string

diff --git a/internal/bacalhau/bacalhau_test.go b/internal/bacalhau/bacalhau_test.go
@@ -5,17 +5,22 @@ import (
 	"testing"
 )
 
-func TestCreateBalhauJob(t *testing.T) {
+func TestCreateBacalhauJob(t *testing.T) {
 	cid := "bafybeibuivbwkakim3hkgphffaipknuhw4epjfu3bstvsuv577spjhbvju"
 	container := "ubuntu"
 	cmd := "echo DeSci"
+	maxTime := 60
+	timeOut := maxTime * 60 // Bacalhau timeout is in seconds, so we need to multiply by 60
 	memory := "12gb"
 	gpu := "1"
 	networkFlag := true
-	job, err := CreateBacalhauJob(cid, container, cmd, 12, true, networkFlag, []string{})
+	job, err := CreateBacalhauJob(cid, container, cmd, 60, 12, true, networkFlag, []string{})
 	if err != nil {
 		t.Fatalf(fmt.Sprint(err))
 	}
+	if job.Spec.Timeout != float64(timeOut) {
+		t.Errorf("got = %f; wanted %d", job.Spec.Timeout, timeOut)
+	}
 	if job.Spec.Resources.Memory != memory {
 		t.Errorf("got = %s; wanted %s", job.Spec.Resources.Memory, memory)
 	}

diff --git a/internal/ipwl/ipwl.go b/internal/ipwl/ipwl.go
@@ -157,7 +157,7 @@ func processIOTask(ioEntry IO, index, maxTime int, jobDir, ioJsonPath string, re
 		memory = *toolConfig.MemoryGB
 	}
 
-	bacalhauJob, err := bacalhau.CreateBacalhauJob(cid, toolConfig.DockerPull, cmd, memory, toolConfig.GpuBool, toolConfig.NetworkBool, annotations)
+	bacalhauJob, err := bacalhau.CreateBacalhauJob(cid, toolConfig.DockerPull, cmd, maxTime, memory, toolConfig.GpuBool, toolConfig.NetworkBool, annotations)
 	if err != nil {
 		updateIOWithError(ioJsonPath, index, err, fileMutex)
 		return fmt.Errorf("error creating Bacalhau job: %w", err)