Skip to content

fix(hatchery): try to speedup #3035

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 2 commits into from
Jul 16, 2018
Merged

fix(hatchery): try to speedup #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a62ca88
fix(hatchery): try to speedup
fsamin Jul 16, 2018
df4d89f
fix(hatchery): sort again
fsamin Jul 16, 2018
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 sdk/cdsclient/client_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func shrinkQueue(queue *sdk.WorkflowQueue, l int) time.Time {
if l < 1 {
l = 1
}
l = l * 2
l = l * 3
t0 := (*queue)[len(*queue)-1].Queued

queue.Sort()
Expand Down
11 changes: 0 additions & 11 deletions sdk/hatchery/hatchery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ func Create(h Interface) error {
// Create a cache with a default expiration time of 3 second, and which
// purges expired items every minute
spawnIDs := cache.New(10*time.Second, 60*time.Second)
// This is a local cache to avoid analysing a job twice at the same time
receivedIDs := cache.New(5*time.Second, 60*time.Second)

sdk.GoRoutine("heartbeat", func() {
hearbeat(h, h.Configuration().API.Token, h.Configuration().API.MaxHeartbeatFailures)
Expand All @@ -106,7 +104,6 @@ func Create(h Interface) error {
// read the result channel in another goroutine to let the main goroutine start new workers
sdk.GoRoutine("checkStarterResult", func() {
for startWorkerRes := range workerStartResultChan {
receivedIDs.Delete(string(startWorkerRes.request.id))
if startWorkerRes.err != nil {
errs <- startWorkerRes.err
}
Expand Down Expand Up @@ -209,13 +206,6 @@ func Create(h Interface) error {
continue
}

// Check if the jobs has been received less than 10s ago
if _, exist := receivedIDs.Get(string(j.ID)); exist {
log.Debug("job %d is alrealy being analyzed", j.ID)
continue
}
receivedIDs.SetDefault(string(j.ID), j.ID)

//Check if the jobs is concerned by a pending worker creation
if _, exist := spawnIDs.Get(string(j.ID)); exist {
log.Debug("job %d already spawned in previous routine", j.ID)
Expand All @@ -231,7 +221,6 @@ func Create(h Interface) error {
//Check gracetime
if j.QueuedSeconds < int64(h.Configuration().Provision.GraceTimeQueued) {
log.Debug("job %d is too fresh, queued since %d seconds, let existing waiting worker check it", j.ID)
receivedIDs.Delete(string(j.ID))
continue
}

Expand Down