Skip to content

Commit

Permalink
Merge pull request #9417 from BlaineEXE/fix-health-checker-when-force…
Browse files Browse the repository at this point in the history
…-deleted

pool: file: object: clean up health checkers for force deletion
  • Loading branch information
leseb committed Dec 14, 2021
2 parents 839d7e1 + 0c76be8 commit af30b0a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/operator/ceph/file/controller.go
Expand Up @@ -170,6 +170,8 @@ func (r *ReconcileCephFilesystem) reconcile(request reconcile.Request) (reconcil
// If there was a previous error or if a user removed this resource's finalizer, it's
// possible Rook didn't clean up the monitoring routine for this resource. Ensure the
// routine is stopped when we see the resource is gone.
cephFilesystem.Name = request.Name
cephFilesystem.Namespace = request.Namespace
r.cancelMirrorMonitoring(cephFilesystem)
return reconcile.Result{}, nil
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/ceph/object/controller.go
Expand Up @@ -168,6 +168,8 @@ func (r *ReconcileCephObjectStore) reconcile(request reconcile.Request) (reconci
// If there was a previous error or if a user removed this resource's finalizer, it's
// possible Rook didn't clean up the monitoring routine for this resource. Ensure the
// routine is stopped when we see the resource is gone.
cephObjectStore.Name = request.Name
cephObjectStore.Namespace = request.Namespace
r.stopMonitoring(cephObjectStore)
return reconcile.Result{}, cephObjectStore, nil
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/ceph/pool/controller.go
Expand Up @@ -151,6 +151,8 @@ func (r *ReconcileCephBlockPool) reconcile(request reconcile.Request) (reconcile
// If there was a previous error or if a user removed this resource's finalizer, it's
// possible Rook didn't clean up the monitoring routine for this resource. Ensure the
// routine is stopped when we see the resource is gone.
cephBlockPool.Name = request.Name
cephBlockPool.Namespace = request.Namespace
r.cancelMirrorMonitoring(cephBlockPool)
return reconcile.Result{}, nil
}
Expand Down

0 comments on commit af30b0a

Please sign in to comment.