particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

worker: save result.json in the composer instead of the worker

Browse source 
In the future remote workers will be introduced. Obviously, the remote worker
cannot support the local target. Unfortunately, the current implementation of
storing the osbuild result is dependant on it.

This commit moves the responsibility of storing osbuild result to the
composer process instead of the worker process. The result is transferred from
a worker to a composer using extended HTTP API.
This commit is contained in:
Ondřej Budai 2020-01-30 12:49:16 +01:00 • committed by Tom Gundersen
parent a43dd00459
commit 0d4479bbcd
4 changed files with 57 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/osbuild-worker/main.go
View file

@ -10,6 +10,7 @@ import (
"net"
"net/http"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/jobqueue"
"github.com/osbuild/osbuild-composer/internal/store"
)
@ -54,9 +55,9 @@ func (c *ComposerClient) AddJob() (*jobqueue.Job, error) {
return job, nil
}
func (c *ComposerClient) UpdateJob(job *jobqueue.Job, status string, image *store.Image) error {
func (c *ComposerClient) UpdateJob(job *jobqueue.Job, status string, image *store.Image, result *common.ComposeResult) error {
var b bytes.Buffer
json.NewEncoder(&b).Encode(&jobqueue.JobStatus{status, image})
json.NewEncoder(&b).Encode(&jobqueue.JobStatus{status, image, result})
req, err := http.NewRequest("PATCH", "http://localhost/job-queue/v1/jobs/"+job.ID.String(), &b)
if err != nil {
return err
@ -83,26 +84,26 @@ func handleJob(client *ComposerClient) error {
return err
}
err = client.UpdateJob(job, "RUNNING", nil)
err = client.UpdateJob(job, "RUNNING", nil, nil)
if err != nil {
return err
}
fmt.Printf("Running job %s\n", job.ID.String())
image, err, errs := job.Run()
image, result, err, errs := job.Run()
if err != nil {
log.Printf(" Job failed: %v", err)
return client.UpdateJob(job, "FAILED", nil)
return client.UpdateJob(job, "FAILED", nil, result)
}
for _, err := range errs {
if err != nil {
log.Printf(" Job target error: %v", err)
return client.UpdateJob(job, "FAILED", nil)
return client.UpdateJob(job, "FAILED", nil, result)
}
}
return client.UpdateJob(job, "FINISHED", image)
return client.UpdateJob(job, "FINISHED", image, result)
}
func main() {