[ARVADOS] updated: 1.3.0-2845-ge1ed6272d

[Git user]

Summary of changes:
 lib/dispatchcloud/worker/pool_test.go | 124 ++++++++--------------------------
 1 file changed, 28 insertions(+), 96 deletions(-)

       via  e1ed6272d0e8ecf96aeb6905328498d023d34e0e (commit)
      from  d186ff022ee427ded90307d795537c6429431f09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e1ed6272d0e8ecf96aeb6905328498d023d34e0e
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Aug 7 18:01:45 2020 -0400

    16631: simplify test
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 76e4f71a7..d437668aa 100644
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -147,64 +147,23 @@ func (suite *PoolSuite) TestResumeAfterRestart(c *check.C) {
 }
 
 func (suite *PoolSuite) TestDrain(c *check.C) {
-	type1 := arvados.InstanceType{Name: "a1s", ProviderType: "a1.small", VCPUs: 1, RAM: 1 * GiB, Price: .01}
-
-	waitForIdle := func(pool *Pool, notify <-chan struct{}) {
-		timeout := time.NewTimer(time.Second)
-		for {
-			instances := pool.Instances()
-			sort.Slice(instances, func(i, j int) bool {
-				return strings.Compare(instances[i].ArvadosInstanceType, instances[j].ArvadosInstanceType) < 0
-			})
-			if len(instances) == 1 &&
-				instances[0].ArvadosInstanceType == type1.Name &&
-				instances[0].WorkerState == StateIdle.String() {
-				return
-			}
-			select {
-			case <-timeout.C:
-				c.Logf("pool.Instances() == %#v", instances)
-				c.Error("timed out")
-				return
-			case <-notify:
-			}
-		}
-	}
-
 	logger := ctxlog.TestLogger(c)
 	driver := test.StubDriver{HoldCloudOps: true}
-	instanceSetID := cloud.InstanceSetID("test-instance-set-id")
-	is, err := driver.InstanceSet(nil, instanceSetID, nil, logger)
+	instanceSet, err := driver.InstanceSet(nil, "test-instance-set-id", nil, logger)
 	c.Assert(err, check.IsNil)
 
-	newExecutor := func(cloud.Instance) Executor {
-		return &stubExecutor{
-			response: map[string]stubResp{
-				"crunch-run --list":                  {},
-				"true":                               {},
-				"crunch-run --detach --stdin-env ''": {},
-			},
-		}
-	}
+	ac := arvados.NewClientFromEnv()
 
-	cluster := &arvados.Cluster{
-		Containers: arvados.ContainersConfig{
-			CloudVMs: arvados.CloudVMsConfig{
-				BootProbeCommand:   "true",
-				MaxProbesPerSecond: 1000,
-				ProbeInterval:      arvados.Duration(time.Millisecond * 10),
-				SyncInterval:       arvados.Duration(time.Millisecond * 10),
-				//TimeoutIdle:        arvados.Duration(time.Second),
-				TagKeyPrefix: "testprefix:",
-			},
-		},
-		InstanceTypes: arvados.InstanceTypeMap{
+	type1 := arvados.InstanceType{Name: "a1s", ProviderType: "a1.small", VCPUs: 1, RAM: 1 * GiB, Price: .01}
+	pool := &Pool{
+		arvClient:   ac,
+		logger:      logger,
+		newExecutor: func(cloud.Instance) Executor { return &stubExecutor{} },
+		instanceSet: &throttledInstanceSet{InstanceSet: instanceSet},
+		instanceTypes: arvados.InstanceTypeMap{
 			type1.Name: type1,
 		},
 	}
-
-	pool := NewPool(logger, arvados.NewClientFromEnv(), prometheus.NewRegistry(), instanceSetID, is, newExecutor, nil, cluster)
-
 	notify := pool.Subscribe()
 	defer pool.Unsubscribe(notify)
 
@@ -223,55 +182,28 @@ func (suite *PoolSuite) TestDrain(c *check.C) {
 		return len(pool.workers) == 1
 	})
 
-	waitForIdle(pool, notify)
-
-	// Start a container on the worker
-	for _, wkr := range pool.workers {
-		if wkr.instType == type1 {
-			wkr.startContainer(arvados.Container{})
-		}
+	tests := []struct {
+		state        State
+		idleBehavior IdleBehavior
+		result       bool
+	}{
+		{StateIdle, IdleBehaviorHold, false},
+		{StateIdle, IdleBehaviorDrain, false},
+		{StateIdle, IdleBehaviorRun, true},
 	}
 
-	ivs := suite.instancesByType(pool, type1)
-	c.Assert(ivs, check.HasLen, 1)
-	type1instanceID := ivs[0].Instance
-
-	// Place our node in drain state
-	err = pool.SetIdleBehavior(type1instanceID, IdleBehaviorDrain)
-	c.Check(err, check.IsNil)
-
-	waitForIdle(pool, notify)
-
-	ivs = suite.instancesByType(pool, type1)
-	c.Assert(ivs, check.HasLen, 1)
-
-	// Try to start another container, this should fail because our lone worker has
-	// IdleBehavior set to Drain
-	started := pool.StartContainer(type1, arvados.Container{})
-	c.Check(started, check.Equals, false)
-
-	// There should be no unallocated workers
-	suite.wait(c, pool, notify, func() bool {
-		return pool.Unallocated()[type1] == 0
-	})
-
-	// And our worker should eventually go into state ShutDown
-	suite.wait(c, pool, notify, func() bool {
-		ivs := suite.instancesByType(pool, type1)
-		return len(ivs) == 1 && ivs[0].WorkerState == StateShutdown.String()
-	})
-
-	// Unblock all pending Destroy calls. Pool calls Destroy again
-	// if a node still appears in the provider list after a
-	// previous attempt, so there might be more than 1 Destroy
-	// calls to unblock.
-	go driver.ReleaseCloudOps(1111)
+	for _, test := range tests {
+		for _, wkr := range pool.workers {
+			if wkr.instType == type1 {
+				wkr.state = test.state
+				wkr.idleBehavior = test.idleBehavior
+			}
+		}
 
-	// Sync until all instances disappear from the provider list.
-	suite.wait(c, pool, notify, func() bool {
-		pool.getInstancesAndSync()
-		return len(pool.Instances()) == 0
-	})
+		// Try to start another container
+		started := pool.StartContainer(type1, arvados.Container{UUID: "testcontainer"})
+		c.Check(started, check.Equals, test.result)
+	}
 }
 
 func (suite *PoolSuite) TestCreateUnallocShutdown(c *check.C) {

-----------------------------------------------------------------------


hooks/post-receive
--