Only measure until final phase

Signed-off-by: Ryan Hallisey <[email protected]>
akalenyu · Sep 9, 2021 · 45a75b0 · 45a75b0
1 parent 43784ed
commit 45a75b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/pkg/monitoring/perfscale/perfscale_test.go b/pkg/monitoring/perfscale/perfscale_test.go
@@ -54,6 +54,7 @@ var _ = Describe("VMI phase transition time histogram", func() {
 			table.Entry("Time between running and scheduled using fraction of a second", .5, v1.Running, v1.Scheduled),
 			table.Entry("Time between scheduled and scheduling", 2.0, v1.Scheduled, v1.Scheduling),
 			table.Entry("Time between scheduling and pending", 1.0, v1.Scheduling, v1.Pending),
+			table.Entry("Time between running and failed", 1.0, v1.Running, v1.Failed),
 		)
 	})
 

diff --git a/pkg/monitoring/perfscale/vmi-phase-transitions.go b/pkg/monitoring/perfscale/vmi-phase-transitions.go
@@ -38,8 +38,10 @@ func getTransitionTimeSeconds(fromCreation bool, fromDeletion bool, oldVMI *v1.V
 
 	if fromCreation || oldVMI == nil || (oldVMI.Status.Phase == v1.VmPhaseUnset) {
 		oldTime = newVMI.CreationTimestamp.DeepCopy()
-	} else if fromDeletion {
+	} else if fromDeletion && newVMI.IsMarkedForDeletion() {
 		oldTime = newVMI.DeletionTimestamp.DeepCopy()
+	} else if fromDeletion && !newVMI.IsMarkedForDeletion() {
+		return 0.0, fmt.Errorf("missing deletion timestamp")
 	}
 
 	for _, transitionTimestamp := range newVMI.Status.PhaseTransitionTimestamps {
@@ -131,10 +133,6 @@ func newVMIPhaseTransitionTimeHistogramVec(informer cache.SharedIndexInformer) *
 }
 
 func updateVMIPhaseTransitionTimeFromCreationTimeHistogramVec(histogramVec *prometheus.HistogramVec, oldVMI *v1.VirtualMachineInstance, newVMI *v1.VirtualMachineInstance) {
-	if newVMI.IsMarkedForDeletion() {
-		return
-	}
-
 	if oldVMI == nil || oldVMI.Status.Phase == newVMI.Status.Phase {
 		return
 	}
@@ -194,10 +192,7 @@ func newVMIPhaseTransitionTimeFromCreationHistogramVec(informer cache.SharedInde
 
 	informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
 		UpdateFunc: func(oldVMI, newVMI interface{}) {
-			vmi := newVMI.(*v1.VirtualMachineInstance)
-			if !vmi.IsMarkedForDeletion() {
-				updateVMIPhaseTransitionTimeFromCreationTimeHistogramVec(histogramVec, oldVMI.(*v1.VirtualMachineInstance), vmi)
-			}
+			updateVMIPhaseTransitionTimeFromCreationTimeHistogramVec(histogramVec, oldVMI.(*v1.VirtualMachineInstance), newVMI.(*v1.VirtualMachineInstance))
 		},
 	})
 	return histogramVec
@@ -217,12 +212,9 @@ func newVMIPhaseTransitionTimeFromDeletionHistogramVec(informer cache.SharedInde
 
 	informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
 		UpdateFunc: func(oldVMI, newVMI interface{}) {
-			// User is deleting a VM. Record time to deletion.
-			// Stop recording when VMI finalizer is removed
-			vmi := newVMI.(*v1.VirtualMachineInstance)
-			if vmi.IsMarkedForDeletion() {
-				updateVMIPhaseTransitionTimeFromDeletionTimeHistogramVec(histogramVec, oldVMI.(*v1.VirtualMachineInstance), vmi)
-			}
+			// User is deleting a VM. Record the time from the
+			// deletionTimestamp to when the VMI enters the final phase
+			updateVMIPhaseTransitionTimeFromDeletionTimeHistogramVec(histogramVec, oldVMI.(*v1.VirtualMachineInstance), newVMI.(*v1.VirtualMachineInstance))
 		},
 	})
 	return histogramVec