Merge pull request #89 from dallasmarlow/refuse-interval

configurable offer refuse interval

Author: spacejam

cmd/etcd-mesos-scheduler/app.go

@@ -89,6 +89,8 @@ func main() {
 		flag.String("mesos-authentication-principal", "", "Mesos authentication principal")
 	mesosAuthSecretFile :=
 		flag.String("mesos-authentication-secret-file", "", "Mesos authentication secret file")
+	mesosOfferRefuseSeconds :=
+		flag.Float64("mesos-offer-refuse-seconds", 15, "Mesos offer refuse seconds")
 	authProvider :=
 		flag.String("mesos-authentication-provider", sasl.ProviderName,
 			fmt.Sprintf("Authentication provider to use, default is SASL that supports mechanisms: %+v", mech.ListSupported()))
@@ -171,7 +173,7 @@ func main() {
 		*sandboxDisk,
 		*sandboxCpu,
 		*sandboxMem,
-	)
+		*mesosOfferRefuseSeconds)
 	etcdScheduler.ExecutorPath = *executorPath
 	etcdScheduler.Master = *master
 	etcdScheduler.FrameworkName = *frameworkName

scheduler/scheduler.go

@@ -97,6 +97,7 @@ type EtcdScheduler struct {
 	diskPerTask                  float64
 	cpusPerTask                  float64
 	memPerTask                   float64
+	offerRefuseSeconds           float64
 	pauseChan                    chan struct{}
 	chillSeconds                 time.Duration
 	autoReseedEnabled            bool
@@ -132,6 +133,7 @@ func NewEtcdScheduler(
 	diskPerTask float64,
 	cpusPerTask float64,
 	memPerTask float64,
+	offerRefuseSeconds float64,
 ) *EtcdScheduler {
 	return &EtcdScheduler{
 		Stats: Stats{
@@ -163,6 +165,7 @@ func NewEtcdScheduler(
 		diskPerTask:                  diskPerTask,
 		cpusPerTask:                  cpusPerTask,
 		memPerTask:                   memPerTask,
+		offerRefuseSeconds:           offerRefuseSeconds,
 		reconciliationInfo:           map[string]string{},
 	}
 }
@@ -465,8 +468,8 @@ func (s *EtcdScheduler) decline(
 	driver.DeclineOffer(
 		offer.Id,
 		&mesos.Filters{
-			// Decline offers for 5 seconds.
-			RefuseSeconds: proto.Float64(float64(5)),
+			// Decline offers for configured interval.
+			RefuseSeconds: proto.Float64(s.offerRefuseSeconds),
 		},
 	)
 }

scheduler/scheduler_test.go

@@ -52,7 +52,7 @@ func NewOffer(id string) *mesos.Offer {
 
 func TestStartup(t *gotesting.T) {
 	mockdriver := &MockSchedulerDriver{}
-	testScheduler := NewEtcdScheduler(1, 0, 0, false, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256)
+	testScheduler := NewEtcdScheduler(1, 0, 0, false, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256, 1)
 	testScheduler.running = map[string]*config.Node{
 		"etcd-1": nil,
 		"etcd-2": nil,
@@ -106,7 +106,7 @@ func TestStartup(t *gotesting.T) {
 }
 
 func TestReconciliationOnStartup(t *gotesting.T) {
-	testScheduler := NewEtcdScheduler(3, 0, 0, true, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256)
+	testScheduler := NewEtcdScheduler(3, 0, 0, true, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256, 1)
 	mockdriver := &MockSchedulerDriver{
 		runningStatuses: make(chan *mesos.TaskStatus, 10),
 		scheduler:       testScheduler,
@@ -174,7 +174,7 @@ func TestReconciliationOnStartup(t *gotesting.T) {
 }
 
 func TestGrowToDesiredAfterReconciliation(t *gotesting.T) {
-	testScheduler := NewEtcdScheduler(3, 0, 0, true, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256)
+	testScheduler := NewEtcdScheduler(3, 0, 0, true, []*mesos.CommandInfo_URI{}, false, 4096, 1, 256, 1)
 
 	reconciliation := map[string]string{
 		"etcd-1": "slave-1",
@@ -305,6 +305,7 @@ func TestScheduler(t *gotesting.T) {
 		4096,
 		1,
 		256,
+		1,
 	)
 
 	// Skip initialization logic, tested in TestStartup.