X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/da3cd46f9204f522b73023b42e8a4d04f697e9c7..ae44eb7e4d96e44ca3dc0481cef7cef354a23292:/lib/dispatchcloud/worker/pool_test.go

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 1948c1e874..a85f7383ab 100644
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -72,8 +72,8 @@ func (suite *PoolSuite) TestResumeAfterRestart(c *check.C) {
 	newExecutor := func(cloud.Instance) Executor {
 		return &stubExecutor{
 			response: map[string]stubResp{
-				"crunch-run --list": stubResp{},
-				"true":              stubResp{},
+				"crunch-run --list": {},
+				"true":              {},
 			},
 		}
 	}
@@ -146,6 +146,99 @@ func (suite *PoolSuite) TestResumeAfterRestart(c *check.C) {
 	pool2.Stop()
 }
 
+func (suite *PoolSuite) TestDrain(c *check.C) {
+	logger := ctxlog.TestLogger(c)
+	driver := test.StubDriver{}
+	instanceSet, err := driver.InstanceSet(nil, "test-instance-set-id", nil, logger)
+	c.Assert(err, check.IsNil)
+
+	ac := arvados.NewClientFromEnv()
+
+	type1 := test.InstanceType(1)
+	pool := &Pool{
+		arvClient:   ac,
+		logger:      logger,
+		newExecutor: func(cloud.Instance) Executor { return &stubExecutor{} },
+		instanceSet: &throttledInstanceSet{InstanceSet: instanceSet},
+		instanceTypes: arvados.InstanceTypeMap{
+			type1.Name: type1,
+		},
+	}
+	notify := pool.Subscribe()
+	defer pool.Unsubscribe(notify)
+
+	pool.Create(type1)
+
+	// Wait for the instance to either return from its Create
+	// call, or show up in a poll.
+	suite.wait(c, pool, notify, func() bool {
+		pool.mtx.RLock()
+		defer pool.mtx.RUnlock()
+		return len(pool.workers) == 1
+	})
+
+	tests := []struct {
+		state        State
+		idleBehavior IdleBehavior
+		result       bool
+	}{
+		{StateIdle, IdleBehaviorHold, false},
+		{StateIdle, IdleBehaviorDrain, false},
+		{StateIdle, IdleBehaviorRun, true},
+	}
+
+	for _, test := range tests {
+		for _, wkr := range pool.workers {
+			wkr.state = test.state
+			wkr.idleBehavior = test.idleBehavior
+		}
+
+		// Try to start a container
+		started := pool.StartContainer(type1, arvados.Container{UUID: "testcontainer"})
+		c.Check(started, check.Equals, test.result)
+	}
+}
+
+func (suite *PoolSuite) TestNodeCreateThrottle(c *check.C) {
+	logger := ctxlog.TestLogger(c)
+	driver := test.StubDriver{HoldCloudOps: true}
+	instanceSet, err := driver.InstanceSet(nil, "test-instance-set-id", nil, logger)
+	c.Assert(err, check.IsNil)
+
+	type1 := test.InstanceType(1)
+	pool := &Pool{
+		logger:                         logger,
+		instanceSet:                    &throttledInstanceSet{InstanceSet: instanceSet},
+		maxConcurrentInstanceCreateOps: 1,
+		instanceTypes: arvados.InstanceTypeMap{
+			type1.Name: type1,
+		},
+	}
+
+	c.Check(pool.Unallocated()[type1], check.Equals, 0)
+	res := pool.Create(type1)
+	c.Check(pool.Unallocated()[type1], check.Equals, 1)
+	c.Check(res, check.Equals, true)
+
+	res = pool.Create(type1)
+	c.Check(pool.Unallocated()[type1], check.Equals, 1)
+	c.Check(res, check.Equals, false)
+
+	pool.instanceSet.throttleCreate.err = nil
+	pool.maxConcurrentInstanceCreateOps = 2
+
+	res = pool.Create(type1)
+	c.Check(pool.Unallocated()[type1], check.Equals, 2)
+	c.Check(res, check.Equals, true)
+
+	pool.instanceSet.throttleCreate.err = nil
+	pool.maxConcurrentInstanceCreateOps = 0
+
+	res = pool.Create(type1)
+	c.Check(pool.Unallocated()[type1], check.Equals, 3)
+	c.Check(res, check.Equals, true)
+}
+
 func (suite *PoolSuite) TestCreateUnallocShutdown(c *check.C) {
 	logger := ctxlog.TestLogger(c)
 	driver := test.StubDriver{HoldCloudOps: true}