dv, conditions: AnnPodSchedulable should overwrite AnnRunningCondition (#3799)

With #3753
a new annotation AnnPodSchedulable was introduced to allow updating the
running condition of an importer Pod that was unschedulable.

This commit makes it so the unschedulable condition takes precedence
over AnnRunningCondition otherwise a race can occur where
initial Pod creation failure sets the running condition to an erroneous one indefinitely
as the Pod never finishes scheduling and thus never updates.

Signed-off-by: Adi Aloni <[email protected]>

Author: Acedus

pkg/controller/datavolume/conditions.go

@@ -66,7 +66,9 @@ func updateCondition(conditions []cdiv1.DataVolumeCondition, conditionType cdiv1
 }
 
 func updateRunningCondition(conditions []cdiv1.DataVolumeCondition, anno map[string]string) []cdiv1.DataVolumeCondition {
-	if val, ok := anno[cc.AnnRunningCondition]; ok {
+	if schedulable, ok := anno[cc.AnnPodSchedulable]; ok && schedulable == "false" {
+		conditions = updateCondition(conditions, cdiv1.DataVolumeRunning, corev1.ConditionFalse, "Importer pod cannot be scheduled", "Unschedulable")
+	} else if val, ok := anno[cc.AnnRunningCondition]; ok {
 		switch strings.ToLower(val) {
 		case "true":
 			conditions = updateWithTargetRunning(conditions, anno)
@@ -75,8 +77,6 @@ func updateRunningCondition(conditions []cdiv1.DataVolumeCondition, anno map[str
 		default:
 			conditions = updateCondition(conditions, cdiv1.DataVolumeRunning, corev1.ConditionUnknown, anno[cc.AnnRunningConditionMessage], anno[cc.AnnRunningConditionReason])
 		}
-	} else if schedulable, ok := anno[cc.AnnPodSchedulable]; ok && schedulable == "false" {
-		conditions = updateCondition(conditions, cdiv1.DataVolumeRunning, corev1.ConditionFalse, "Importer pod cannot be scheduled", "Unschedulable")
 	} else {
 		conditions = updateCondition(conditions, cdiv1.DataVolumeRunning, corev1.ConditionFalse, anno[cc.AnnRunningConditionMessage], anno[cc.AnnRunningConditionReason])
 	}