fix: ensure orphan CR retention when orphan-auto-deletion is false

ref:7795

Signed-off-by: Nina Zhan <[email protected]>

Author: nzhan126

controller/node_controller.go

@@ -1437,7 +1437,9 @@ func (nc *NodeController) canDeleteOrphan(orphan *longhorn.Orphan, autoDeleteEna
 
 	// When dataCleanableCondition is false, it means the associated node is not ready, missing or evicted (check updateDataCleanableCondition()).
 	// In this case, we can delete the orphan directly because the data is not reachable and no need to keep the orphan resource.
-	canDelete := autoDeleteAllowed || dataCleanableCondition.Status == longhorn.ConditionStatusFalse
+	canDelete := autoDeleteAllowed || ((dataCleanableCondition.Status == longhorn.ConditionStatusFalse) &&
+		(dataCleanableCondition.Reason == longhorn.OrphanConditionTypeDataCleanableReasonNodeDeleted ||
+			dataCleanableCondition.Reason == longhorn.OrphanConditionTypeDataCleanableReasonNodeEvicted))
 	if !canDelete {
 		nc.logger.Debugf("Orphan %v is not ready to be deleted, autoDeleteAllowed: %v, dataCleanableCondition: %v", orphan.Name, autoDeleteAllowed, dataCleanableCondition.Status)
 	}

controller/orphan_controller.go

@@ -596,20 +596,20 @@ func (oc *OrphanController) updateDataCleanableCondition(orphan *longhorn.Orphan
 		orphan.Status.Conditions = types.SetCondition(orphan.Status.Conditions, longhorn.OrphanConditionTypeDataCleanable, status, reason, "")
 	}()
 
-	isUnavailable, err := oc.ds.IsNodeDownOrDeletedOrMissingManager(orphan.Spec.NodeID)
-	if err != nil {
-		return errors.Wrapf(err, "failed to check node down or missing manager for node %v", orphan.Spec.NodeID)
-	}
-	if isUnavailable {
-		reason = longhorn.OrphanConditionTypeDataCleanableReasonNodeUnavailable
-		return nil
-	}
-
 	node, err := oc.ds.GetNode(orphan.Spec.NodeID)
 	if err != nil {
 		if !datastore.ErrorIsNotFound(err) {
 			return fmt.Errorf("failed to get node %v", orphan.Spec.NodeID)
 		}
+		reason = longhorn.OrphanConditionTypeDataCleanableReasonNodeDeleted
+		return nil
+	}
+
+	isUnavailable, err := oc.ds.IsNodeDownOrDeletedOrMissingManager(orphan.Spec.NodeID)
+	if err != nil {
+		return errors.Wrapf(err, "failed to check node down or missing manager for node %v", orphan.Spec.NodeID)
+	}
+	if isUnavailable {
 		reason = longhorn.OrphanConditionTypeDataCleanableReasonNodeUnavailable
 		return nil
 	}

k8s/pkg/apis/longhorn/v1beta2/orphan.go

@@ -16,6 +16,7 @@ const (
 	OrphanConditionTypeInstanceExist = "InstanceExist"
 
 	OrphanConditionTypeDataCleanableReasonNodeUnavailable = "NodeUnavailable"
+	OrphanConditionTypeDataCleanableReasonNodeDeleted     = "NodeDeleted"
 	OrphanConditionTypeDataCleanableReasonNodeEvicted     = "NodeEvicted"
 	OrphanConditionTypeDataCleanableReasonDiskInvalid     = "DiskInvalid"
 	OrphanConditionTypeDataCleanableReasonDiskEvicted     = "DiskEvicted"