feat(hatchery): MaxConcurrentRegistering (#4244)

* feat(hatchery): key MaxConcurrentRegistering Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
ovh · May 2, 2019 · 3668678 · 3668678
1 parent e51a063
commit 3668678
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/sdk/hatchery/register.go b/sdk/hatchery/register.go
@@ -3,7 +3,6 @@ package hatchery
 import (
 	"context"
 	"fmt"
-	"math"
 	"strings"
 	"sync/atomic"
 
@@ -40,7 +39,10 @@ func workerRegister(ctx context.Context, h Interface, startWorkerChan chan<- wor
 			continue
 		}
 
-		maxRegistration := int64(math.Floor(float64(h.Configuration().Provision.MaxWorker) / 4))
+		maxRegistration := int64(h.Configuration().Provision.MaxConcurrentRegistering)
+		if maxRegistration == 0 {
+			maxRegistration = 2
+		}
 		if atomic.LoadInt64(&nbRegisteringWorkerModels) > maxRegistration {
 			log.Debug("hatchery> workerRegister> max registering worker reached")
 			return nil

diff --git a/sdk/hatchery/types.go b/sdk/hatchery/types.go
@@ -35,6 +35,7 @@ type CommonConfiguration struct {
 		Frequency                 int  `toml:"frequency" default:"30" comment:"Check provisioning each n Seconds" json:"frequency"`
 		MaxWorker                 int  `toml:"maxWorker" default:"10" comment:"Maximum allowed simultaneous workers" json:"maxWorker"`
 		MaxConcurrentProvisioning int  `toml:"maxConcurrentProvisioning" default:"10" comment:"Maximum allowed simultaneous workers provisioning" json:"maxConcurrentProvisioning"`
+		MaxConcurrentRegistering  int  `toml:"maxConcurrentRegistering" default:"2" comment:"Maximum allowed simultaneous workers registering. -1 to disable registering on this hatchery" json:"maxConcurrentRegistering"`
 		GraceTimeQueued           int  `toml:"graceTimeQueued" default:"4" comment:"if worker is queued less than this value (seconds), hatchery does not take care of it" json:"graceTimeQueued"`
 		RegisterFrequency         int  `toml:"registerFrequency" default:"60" comment:"Check if some worker model have to be registered each n Seconds" json:"registerFrequency"`
 		WorkerLogsOptions         struct {