Commit75849b8

authored and

committed

chore: add test for coord rolling restart

1 parent7f98fa3 commit75849b8Copy full SHA for 75849b8

File tree

+354

-5

lines changed

+354

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1399,9 +1399,6 @@ func (api *API) Close() error {`
`1399`	`1399`	`default:`
`1400`	`1400`	`api.cancel()`
`1401`	`1401`	`}`
`1402`		`-ifapi.derpCloseFunc!=nil {`
`1403`		`-api.derpCloseFunc()`
`1404`		`-}`
`1405`	`1402`
`1406`	`1403`	`wsDone:=make(chanstruct{})`
`1407`	`1404`	`timer:=time.NewTimer(10*time.Second)`
`@@ -1427,11 +1424,14 @@ func (api *API) Close() error {`
`1427`	`1424`	`api.updateChecker.Close()`
`1428`	`1425`	`}`
`1429`	`1426`	`_=api.workspaceAppServer.Close()`
	`1427`	`+_=api.agentProvider.Close()`
	`1428`	`+ifapi.derpCloseFunc!=nil {`
	`1429`	`+api.derpCloseFunc()`
	`1430`	`+}`
`1430`	`1431`	`coordinator:=api.TailnetCoordinator.Load()`
`1431`	`1432`	`ifcoordinator!=nil {`
`1432`	`1433`	`_= (*coordinator).Close()`
`1433`	`1434`	`}`
`1434`		`-_=api.agentProvider.Close()`
`1435`	`1435`	`_=api.statsReporter.Close()`
`1436`	`1436`	`_=api.NetworkTelemetryBatcher.Close()`
`1437`	`1437`	`returnnil`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ var (`
`254`	`254`	`rbac.ResourceNotificationPreference.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},`
`255`	`255`	`rbac.ResourceNotificationTemplate.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},`
`256`	`256`	`rbac.ResourceCryptoKey.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},`
	`257`	`+rbac.ResourceTailnetCoordinator.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},`
`257`	`258`	`}),`
`258`	`259`	`Org:map[string][]rbac.Permission{},`
`259`	`260`	`User: []rbac.Permission{},`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,8 @@ func newBinder(ctx context.Context,`
`506`	`506`
`507`	`507`	`b.logger.Debug(b.ctx,"updating peers to lost")`
`508`	`508`
`509`		`-ctx,cancel:=context.WithTimeout(context.Background(),time.Second*15)`
	`509`	`+//nolint:gocritic // provisioner is system`
	`510`	`+ctx,cancel:=context.WithTimeout(dbauthz.AsSystemRestricted(context.Background()),time.Second*15)`
`510`	`511`	`defercancel()`
`511`	`512`	`err:=b.store.UpdateTailnetPeerStatusByCoordinator(ctx, database.UpdateTailnetPeerStatusByCoordinatorParams{`
`512`	`513`	`CoordinatorID:b.coordinatorID,`

Comments

(0)