Skip to content
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.

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

pool: file: object: clean up health checkers for force deletion #9417

Merged
merged 1 commit into from Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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