github/containerized-data-importer
7
0
Fork 0
mirror of https://github.com/kubevirt/containerized-data-importer.git synced 2025-06-03 06:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix StorageProfile incomplete metric test flakiness (#2557)

Browse Source 
Signed-off-by: Arnon Gilboa <agilboa@redhat.com>

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
This commit is contained in:
Arnon Gilboa 2023-01-26 20:14:50 +02:00 committed by GitHub
parent fe006ad923
commit 00bc43f35b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/cdi-controller/controller.go
View File

@ -349,6 +349,7 @@ func getTokenPrivateKey() *rsa.PrivateKey {
func registerMetrics() { func registerMetrics() {
metrics.Registry.MustRegister(controller.IncompleteProfileGauge) metrics.Registry.MustRegister(controller.IncompleteProfileGauge)
controller.IncompleteProfileGauge.Set(-1)
metrics.Registry.MustRegister(controller.DataImportCronOutdatedGauge) metrics.Registry.MustRegister(controller.DataImportCronOutdatedGauge)
} }

12
tests/operator_test.go
View File

@ -981,18 +981,24 @@ var _ = Describe("ALL Operator tests", func() {
Skip("This test depends on prometheus infra being available") Skip("This test depends on prometheus infra being available")
} }
numAddedStorageClasses = 2
defaultStorageClass := utils.GetDefaultStorageClass(f.K8sClient) defaultStorageClass := utils.GetDefaultStorageClass(f.K8sClient)
defaultStorageClassProfile := &cdiv1.StorageProfile{} defaultStorageClassProfile := &cdiv1.StorageProfile{}
err := f.CrClient.Get(context.TODO(), types.NamespacedName{Name: defaultStorageClass.Name}, defaultStorageClassProfile) err := f.CrClient.Get(context.TODO(), types.NamespacedName{Name: defaultStorageClass.Name}, defaultStorageClassProfile)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
originalMetricVal := 0
Eventually(func() int {
originalMetricVal = getMetricValue("kubevirt_cdi_incomplete_storageprofiles_total")
return originalMetricVal
}, 2*time.Minute, 1*time.Second).ShouldNot(Equal(-1))
numAddedStorageClasses = 2
for i := 0; i < numAddedStorageClasses; i++ { for i := 0; i < numAddedStorageClasses; i++ {
_, err = f.K8sClient.StorageV1().StorageClasses().Create(context.TODO(), createUnknownStorageClass(fmt.Sprintf("unknown-sc-%d", i)), metav1.CreateOptions{}) _, err = f.K8sClient.StorageV1().StorageClasses().Create(context.TODO(), createUnknownStorageClass(fmt.Sprintf("unknown-sc-%d", i)), metav1.CreateOptions{})
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
} }
originalMetricVal := getMetricValue("kubevirt_cdi_incomplete_storageprofiles_total")
expectedIncomplete := originalMetricVal + numAddedStorageClasses
expectedIncomplete := originalMetricVal + numAddedStorageClasses
Eventually(func() int { Eventually(func() int {
return getMetricValue("kubevirt_cdi_incomplete_storageprofiles_total") return getMetricValue("kubevirt_cdi_incomplete_storageprofiles_total")
}, 2*time.Minute, 1*time.Second).Should(BeNumerically("==", expectedIncomplete)) }, 2*time.Minute, 1*time.Second).Should(BeNumerically("==", expectedIncomplete))