Commit45af7d7

committed

remove barrier

1 parent20db665 commit45af7d7Copy full SHA for 45af7d7

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`package coderconnect`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"sync"`
`4`	`5`	`"time"`
`5`	`6`
`6`	`7`	`"github.com/google/uuid"`
`7`	`8`	`"golang.org/x/xerrors"`
`8`	`9`
`9`	`10`	`"github.com/coder/coder/v2/codersdk"`
`10`		`-"github.com/coder/coder/v2/scaletest/harness"`
`11`	`11`	`"github.com/coder/coder/v2/scaletest/workspacebuild"`
`12`	`12`	`)`
`13`	`13`
`@@ -66,7 +66,7 @@ type Config struct {`
`66`	`66`
`67`	`67`	`// DialBarrier is used to ensure all runners have dialed the Coder Connect`
`68`	`68`	`// endpoint before creating their workspace(s).`
`69`		-DialBarrier*harness.Barrier`json:"-"`
	`69`	+DialBarrier*sync.WaitGroup`json:"-"`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`func (cConfig)Validate()error {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {`
`64`	`64`	`reachedBarrier:=false`
`65`	`65`	`deferfunc() {`
`66`	`66`	`if!reachedBarrier {`
`67`		`-r.cfg.DialBarrier.Cancel()`
	`67`	`+r.cfg.DialBarrier.Done()`
`68`	`68`	`}`
`69`	`69`	`}()`
`70`	`70`
`@@ -125,6 +125,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {`
`125`	`125`	`}()`
`126`	`126`
`127`	`127`	`reachedBarrier=true`
	`128`	`+r.cfg.DialBarrier.Done()`
`128`	`129`	`r.cfg.DialBarrier.Wait()`
`129`	`130`
`130`	`131`	`workspaceRunners:=make([]*workspacebuild.Runner,0,r.cfg.WorkspaceCount)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package coderconnect_test`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"strconv"`
	`6`	`+"sync"`
`6`	`7`	`"testing"`
`7`	`8`
`8`	`9`	`"github.com/google/uuid"`
`@@ -64,7 +65,8 @@ func TestRun(t *testing.T) {`
`64`	`65`	`template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)`
`65`	`66`	`coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)`
`66`	`67`
`67`		`-barrier:=harness.NewBarrier(numUsers)`
	`68`	`+barrier:=new(sync.WaitGroup)`
	`69`	`+barrier.Add(numUsers)`
`68`	`70`	`metrics:=coderconnect.NewMetrics(prometheus.NewRegistry())`
`69`	`71`
`70`	`72`	`th:=harness.NewTestHarness(harness.ConcurrentExecutionStrategy{}, harness.ConcurrentExecutionStrategy{})`

Comments

(0)