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

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 0c173c107d..0f5c5ee196 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": {},
-				"true":              {},
+				"crunch-run-custom --list": {},
+				"true":                     {},
 			},
 		}
 	}
@@ -87,6 +87,7 @@ func (suite *PoolSuite) TestResumeAfterRestart(c *check.C) {
 				SyncInterval:       arvados.Duration(time.Millisecond * 10),
 				TagKeyPrefix:       "testprefix:",
 			},
+			CrunchRunCommand: "crunch-run-custom",
 		},
 		InstanceTypes: arvados.InstanceTypeMap{
 			type1.Name: type1,
@@ -199,6 +200,46 @@ func (suite *PoolSuite) TestDrain(c *check.C) {
 	}
 }
 
+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}