admin/cozystack
1
0 Fork 0
mirror of https://github.com/cozystack/cozystack.git synced 2026-11-03 18:47:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-1.5] fix(kamaji): backport datastore unused-deletion deadlock fix (clastix/kamaji#1122) (#3187)

Browse Source 
# Description
Backport of #3146 to `release-1.5`.
This commit is contained in:
myasnikovdaniil authored and GitHub committed 2026-07-03 14:53:25 +05:00
2 parents 3e25f19223 a114736fd3
commit ccb325eaaa
1 file changed
+12
Download Patch File Download Diff File Expand all files Collapse all files
packages/system/kamaji/images/kamaji/patches/fix-datastore-unused-deletion.diff
+12
View File
@@ -0,0 +1,12 @@
diff --git a/controllers/datastore_controller.go b/controllers/datastore_controller.go
--- a/controllers/datastore_controller.go
+++ b/controllers/datastore_controller.go
@@ -151,7 +151,7 @@ func (r *DataStore) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
return reconcile.Result{}, nil
}
- if meta.IsStatusConditionFalse(ds.Status.Conditions, kamajiv1alpha1.DataStoreConditionAllowedDeletionType) {
+ if meta.IsStatusConditionFalse(ds.Status.Conditions, kamajiv1alpha1.DataStoreConditionAllowedDeletionType) || len(tcpList.Items) == 0 {
logger.Info("DataStore is not used by any TenantControlPlane object")
meta.SetStatusCondition(&ds.Status.Conditions, metav1.Condition{