Skip to content

Propagate the context to the stoppable-managers for ordered shutdown #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raffaelespazzoli merged 1 commit into from
Jan 24, 2022
Merged

Propagate the context to the stoppable-managers for ordered shutdown #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/util/lockedresourcecontroller/enforcing-reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (er *EnforcingReconciler) UpdateLockedResourcesWithRestConfig(context conte
er.log.Error(err, "unable to delete unmanaged", "resources", leftDifference)
return err
}
err := lockedResourceManager.Restart(lockedResources, lockedPatches, false, config)
err := lockedResourceManager.Restart(context, lockedResources, lockedPatches, false, config)
if err != nil {
er.log.Error(err, "unable to restart", "manager", lockedResourceManager)
return err
Expand Down
9 changes: 5 additions & 4 deletions pkg/util/lockedresourcecontroller/locked-resource-manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (lrm *LockedResourceManager) IsStarted() bool {
}

// Start starts the LockedResourceManager
func (lrm *LockedResourceManager) Start(config *rest.Config) error {
func (lrm *LockedResourceManager) Start(ctx context.Context, config *rest.Config) error {
if lrm.stoppableManager != nil && lrm.stoppableManager.IsStarted() {
return nil
}
Expand Down Expand Up @@ -165,7 +165,7 @@ func (lrm *LockedResourceManager) Start(config *rest.Config) error {
}
lrm.patchReconcilers = patchReconcilers

lrm.stoppableManager.Start()
lrm.stoppableManager.Start(ctx)
return nil
}

Expand Down Expand Up @@ -210,7 +210,8 @@ func (lrm *LockedResourceManager) scanNamespaces() []string {

// Restart restarts the manager with a different set of resources
// if deleteResources is set, resources that were enforced are deleted.
func (lrm *LockedResourceManager) Restart(resources []lockedresource.LockedResource, patches []lockedpatch.LockedPatch, deleteResources bool, config *rest.Config) error {
func (lrm *LockedResourceManager) Restart(ctx context.Context, resources []lockedresource.LockedResource,
patches []lockedpatch.LockedPatch, deleteResources bool, config *rest.Config) error {
if lrm.IsStarted() {
err := lrm.Stop(deleteResources)
if err != nil {
Expand All @@ -228,7 +229,7 @@ func (lrm *LockedResourceManager) Restart(resources []lockedresource.LockedResou
lrm.log.Error(err, "unable to set", "patches", patches)
return err
}
return lrm.Start(config)
return lrm.Start(ctx, config)
}

// IsSameResources checks whether the currently enforced resources are the same as the ones passed as parameters
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/stoppablemanager/stoppable-manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ func (sm *StoppableManager) Stop() {
}

//Start starts the manager. Restarting a starated manager is a noop that will be logged.
func (sm *StoppableManager) Start() {
func (sm *StoppableManager) Start(parentCtx context.Context) {
if sm.started {
log.Error(errors.New("invalid argument"), "start called on a started channel")
return
}
ctx, cancel := context.WithCancel(context.TODO())
ctx, cancel := context.WithCancel(parentCtx)
sm.cancelFunction = cancel
go func() {
err := sm.Manager.Start(ctx)
Expand Down