From 6f0c98bed831308f2bc270a542902c0448c939a6 Mon Sep 17 00:00:00 2001
From: Hemant Kumar <hekumar@redhat.com>
Date: Tue, 10 Oct 2017 11:29:41 -0400
Subject: [PATCH] Fix flake for volume detach metrics

---
 test/e2e/storage/volume_metrics.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/e2e/storage/volume_metrics.go b/test/e2e/storage/volume_metrics.go
index e6620296042..3a152f806ec 100644
--- a/test/e2e/storage/volume_metrics.go
+++ b/test/e2e/storage/volume_metrics.go
@@ -100,7 +100,7 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
 		backoff := wait.Backoff{
 			Duration: 10 * time.Second,
 			Factor:   1.2,
-			Steps:    3,
+			Steps:    21,
 		}
 
 		updatedStorageMetrics := make(map[string]int64)
@@ -113,7 +113,11 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
 				return false, err
 			}
 			updatedStorageMetrics = getControllerStorageMetrics(updatedMetrics)
-			if len(updatedStorageMetrics) == 0 {
+			metricCount := len(updatedStorageMetrics)
+			// Usually a pod deletion does not mean immediate volume detach
+			// we will have to retry to verify volume_detach metrics
+			_, detachMetricFound := updatedStorageMetrics["volume_detach"]
+			if metricCount < 3 || !detachMetricFound {
 				framework.Logf("Volume metrics not collected yet, going to retry")
 				return false, nil
 			}