feat(engine): hatchery as a uservice - auth #3326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
yesnault
requested review from
bnjjj,
fsamin,
richardlt and
sguiheux
as code owners
richardlt
approved these changes
Sep 14, 2018
|
WIP do not merge yet |
yesnault
changed the title
golangcibot
reviewed
Sep 14, 2018
engine/api/hatchery.go
Outdated
| @@ -34,37 +32,35 @@ func (api *API) registerHatcheryHandler() service.Handler { | |||
| return sdk.WrapError(err, "registerHatcheryHandler> Cannot load hatchery %s", hatch.Name) | |||
| } | |||
|
|
|||
| tx, errBegin := api.mustDB().Begin() | |||
| defer tx.Rollback() | |||
There was a problem hiding this comment.
Error return value of tx.Rollback is not checked
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
yesnault
changed the title
|
CDS Report ut-engine#5975.1 ✘
|
sguiheux
requested changes
Sep 17, 2018
| if hatchery.RatioService == 100 { | ||
| where = " AND contains_service = true " | ||
| } else if hatchery.RatioService == 0 { | ||
| where = " AND (contains_service is NULL or contains_service = false) " |
There was a problem hiding this comment.
contains_service is NULL . is mandatory ???
engine/api/workflow/gorp_model.go
Outdated
| @@ -89,6 +89,7 @@ type JobRun struct { | |||
| ExecGroups sql.NullString `db:"exec_groups"` | |||
| PlatformPluginBinaries sql.NullString `db:"platform_plugin_binaries"` | |||
| BookedBy sdk.Hatchery `db:"-"` | |||
| ContainsService sql.NullBool `db:"contains_service"` | |||
There was a problem hiding this comment.
sql.Bool ? ( is false is applied on old lines)
engine/sql/128_hatchery_type.sql
Outdated
|
|
||
| ALTER TABLE hatchery | ||
| ADD COLUMN worker_model_id BIGINT, | ||
| ADD COLUMN model_type VARCHAR(50) DEFAULT '', |
engine/sql/128_hatchery_type.sql
Outdated
| -- +migrate Up | ||
|
|
||
| ALTER TABLE hatchery | ||
| ADD COLUMN worker_model_id BIGINT, |
There was a problem hiding this comment.
Remove worker_model_id, localhatchery must check requirement from its path
fsamin
requested changes
Sep 17, 2018
engine/api/hatchery/hatchery.go
Outdated
| var errg error | ||
| h.UID, errg = generateID() | ||
| hatchery.UID, errg = generateID() |
engine/api/hatchery/gorp_model.go
Outdated
| ) | ||
|
|
||
| // Hatchery is a gorp wrapper around sdk.Hatchery | ||
| type Hatchery sdk.Hatchery |
engine/api/hatchery/hatchery.go
Outdated
| Cmd: "worker --api={{.API}} --token={{.Token}} --basedir={{.BaseDir}} --model={{.Model}} --name={{.Name}} --hatchery={{.Hatchery}} --hatchery-name={{.HatcheryName}} --insecure={{.HTTPInsecure}} --booked-workflow-job-id={{.WorkflowJobID}} --booked-pb-job-id={{.PipelineBuildJobID}} --single-use --force-exit", | ||
| } | ||
| if err := worker.InsertWorkerModel(db, &hatchery.Model); err != nil && strings.Contains(err.Error(), "idx_worker_model_name") { | ||
| return sdk.ErrModelNameExist |
There was a problem hiding this comment.
may be we should update the model and not raise an error
engine/api/hatchery/hatchery.go
Outdated
| } | ||
| return nil, err | ||
| return nil, sdk.ErrNotFound |
engine/api/hatchery/hatchery.go
Outdated
|
|
||
| var h sdk.Hatchery | ||
| var wmID sql.NullInt64 | ||
| var hatchery Hatchery | ||
| hasher := sha512.New() | ||
| hashed := base64.StdEncoding.EncodeToString(hasher.Sum([]byte(token))) |
engine/api/hatchery/hatchery.go
Outdated
|
|
||
| return nil | ||
| } | ||
|
|
||
| func generateID() (string, error) { |
engine/api/services.go
Outdated
| } | ||
| if svcs[i].Type == "hatchery" { | ||
| log.Info("killDeadServices> Delete dead hatchery: %v", &svcs[i].Name) | ||
| if err := hatchery.DeleteHatcheryByName(db, svcs[i].Name); err != nil { |
There was a problem hiding this comment.
we shouldn't have to delete manually the hatchery when we remove the service. There should be a foreign key and a delete cascade
engine/api/services.go
Outdated
| } | ||
| case <-ctx.Done(): | ||
| if err := ctx.Err(); err != nil { | ||
| log.Error("Exiting killDeadServices: %v", err) |
yesnault
changed the title
fsamin
requested changes
Sep 19, 2018
engine/api/api_routes.go
Outdated
| @@ -248,7 +246,6 @@ func (api *API) InitRouter() { | |||
| r.Handle("/project/{permProjectKey}/push/workflows", r.POST(api.postWorkflowPushHandler)) | |||
|
|
|||
| // Workflows run | |||
| r.Handle("/project/{permProjectKey}/runs", r.GET(api.getWorkflowAllRunsHandler, EnableTracing())) | |||
engine/api/hatchery/hatchery.go
Outdated
| WHERE ( | ||
| hatchery.group_id = ANY( | ||
| services.type = 'hatchery' |
engine/api/hatchery/hatchery.go
Outdated
| WHERE ( | ||
| hatchery.group_id = ANY( | ||
| services.type = 'hatchery' |
engine/api/mon_db.go
Outdated
| } | ||
|
|
||
| if _, err := workflow.LoadNodeJobRunQueue(ctx, api.mustDB(), api.Cache, permissions, groupsID, usr, nil, nil, nil); err != nil { | ||
| if _, err := workflow.LoadNodeJobRunQueue(ctx, api.mustDB(), api.Cache, "", nil, permissions, groupsID, usr, nil, nil, nil); err != nil { |
There was a problem hiding this comment.
too mush optional parameters
we need more specialized function of an option struct
engine/api/workflow_run.go
Outdated
| @@ -136,18 +136,6 @@ func (api *API) searchWorkflowRun(ctx context.Context, w http.ResponseWriter, r | |||
| return service.WriteJSON(w, runs, code) | |||
| } | |||
|
|
|||
| func (api *API) getWorkflowAllRunsHandler() service.Handler { | |||
| @@ -60,14 +60,29 @@ func LoadNodeJobRunQueue(ctx context.Context, db gorp.SqlExecutor, store cache.S | |||
| statuses = []string{sdk.StatusWaiting.String()} | |||
| } | |||
|
|
|||
| var where string | |||
There was a problem hiding this comment.
the sql query is unreadable :(
how can we improve this code ?
engine/api/workflow_queue.go
Outdated
| @@ -753,7 +754,15 @@ func getSinceUntilLimitHeader(ctx context.Context, w http.ResponseWriter, r *htt | |||
| limit, _ = strconv.Atoi(limitHeader) | |||
| } | |||
|
|
|||
| return since, until, limit | |||
| ratioServiceHeader := r.Header.Get("X-CDS-Ratio-Service") | |||
engine/api/workflow_queue.go
Outdated
| @@ -702,7 +702,7 @@ func (api *API) countWorkflowJobQueueHandler() service.Handler { | |||
|
|
|||
| func (api *API) getWorkflowJobQueueHandler() service.Handler { | |||
| return func(ctx context.Context, w http.ResponseWriter, r *http.Request) error { | |||
| since, until, limit := getSinceUntilLimitHeader(ctx, w, r) | |||
| since, until, limit, modelType, ratioService := getQueueHeaders(ctx, w, r) | |||
There was a problem hiding this comment.
Is there any tests on this new options
bnjjj
suggested changes
Sep 19, 2018
engine/hatchery/local/local.go
Outdated
| } | ||
| } | ||
|
|
||
| for _, r := range tmp { |
There was a problem hiding this comment.
declare capa here with a good length or capacity :)
sguiheux
approved these changes
Sep 19, 2018
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
bnjjj
approved these changes
Sep 20, 2018
|
CDS Report build-engine-cli-tools#6067.0 ✘
|
fsamin
requested changes
Sep 20, 2018
engine/api/build_test.go
Outdated
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/ovh/cds/engine/api/services" | ||
| "github.com/ovh/cds/engine/api/sessionstore" | ||
| "github.com/ovh/cds/sdk/namesgenerator" |
fsamin
approved these changes
Sep 20, 2018
This was referenced Feb 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
close #3315 (with 5f461f6 too)
Signed-off-by: Yvonnick Esnault yvonnick.esnault@corp.ovh.com