fix

Author: nzhan126

controller/node_controller.go

@@ -1390,10 +1390,9 @@ func (nc *NodeController) getNewAndMissingOrphanedReplicaDataStores(diskName, di
 		if !ok {
 			if reused {
 				nc.logger.Infof("Orphan %v is reused by replica. Tring to mark DeleteCustomResourceOnly.", orphan.Name)
-				orphan = orphan.DeepCopy()
-				orphan.Labels[types.DeleteCustomResourceOnly] = string(longhorn.ConditionStatusTrue)
-				if _, err := nc.ds.UpdateOrphan(orphan); err != nil {
-					nc.logger.WithError(err).Warnf("Failed to update orphan %v after setting DeleteCustomResourceOnly label", orphan.Name)
+				if err := datastore.AddOrphanDeleteCustomResourceOnlyLabel(nc.ds, orphan.Name); err != nil {
+					nc.logger.Infof("failed to add label delete-custom-resource-only to orphan %v ", orphan.Name)
+					return map[string]string{}, map[string]string{}
 				}
 			}
 			nc.logger.Infof("Adding Orphan %v to missingOrphan", orphan.Name)

controller/orphan_controller.go

@@ -646,8 +646,8 @@ func (oc *OrphanController) checkOrphanedReplicaDataCleanable(node *longhorn.Nod
 		return longhorn.OrphanConditionTypeDataCleanableReasonDiskEvicted
 	}
 
-	value, _ := datastore.GetLonghornDeleteCustomResourceOnlyValue(orphan)
-	if value == string(longhorn.ConditionStatusTrue) {
+	exists, _ := datastore.IsLabelLonghornDeleteCustomResourceOnlyExisting(orphan)
+	if exists {
 		return longhorn.OrphanConditionTypeDataCleanableReasonSkipped
 	}
 

datastore/longhorn.go

@@ -3359,11 +3359,8 @@ func GetLonghornDeleteCustomResourceOnlyValue(obj k8sruntime.Object) (string, er
 	if labels == nil {
 		return "", nil
 	}
-	value, ok := labels[types.GetLonghornLabelKey(types.DeleteCustomResourceOnly)]
-	if !ok {
-		return "", fmt.Errorf("label %q not found", types.GetLonghornLabelKey(types.DeleteCustomResourceOnly))
-	}
-	return value, nil
+
+	return labels[types.GetLonghornLabelKey(types.DeleteCustomResourceOnly)], nil
 }
 
 // labelLonghornDeleteCustomResourceOnly labels the object with the label `longhorn.io/delete-custom-resource-only: true`
@@ -3481,6 +3478,28 @@ func AddSystemBackupDeleteCustomResourceOnlyLabel(ds *DataStore, systemBackupNam
 	return nil
 }
 
+// AddOrphanDeleteCustomResourceOnlyLabel adds the label `longhorn.io/delete-custom-resource-only: true` to the Orphan
+func AddOrphanDeleteCustomResourceOnlyLabel(ds *DataStore, OrphanName string) error {
+	logrus.Info("adding delete CR resource only label")
+	orphan, err := ds.GetOrphan(OrphanName)
+	if err != nil {
+		return err
+	}
+	if exists, err := IsLabelLonghornDeleteCustomResourceOnlyExisting(orphan); err != nil {
+		return err
+	} else if exists {
+		return nil
+	}
+	if err := labelLonghornDeleteCustomResourceOnly(orphan); err != nil {
+		return err
+	}
+	if _, err = ds.UpdateOrphan(orphan); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func FixupRecurringJob(v *longhorn.Volume) error {
 	if err := labelRecurringJobDefault(v); err != nil {
 		return err

types/types.go

@@ -667,7 +667,6 @@ func GetOrphanLabelsForOrphanedDirectory(nodeID, diskUUID string) map[string]str
 	labels[GetLonghornLabelComponentKey()] = LonghornLabelOrphan
 	labels[LonghornNodeKey] = nodeID
 	labels[GetLonghornLabelKey(LonghornLabelOrphanType)] = string(longhorn.OrphanTypeReplicaData)
-	labels[GetLonghornLabelKey(DeleteCustomResourceOnly)] = string(longhorn.ConditionStatusFalse)
 	return labels
 }