Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c00d896
maxTime flag propagates to bacalhau job spec timeout value
acashmoney Sep 7, 2023
cbfdcc6
ready for binary v0.10.3
acashmoney Sep 7, 2023
35138a3
fixes testing function name typo
acashmoney Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion internal/bacalhau/bacalhau.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 7 additions & 2 deletions internal/bacalhau/bacalhau_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/ipwl/ipwl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down