mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: add logErr function to log errors

Browse Source 
logErr function logs all the ocured errors
with a message that is passed for occurence
of each error.

Co-authored-by: Niels de Vos <ndevos@redhat.com>
Co-authored-by: Madhu Rajanna <madhupr007@gmail.com>
Signed-off-by: Yug <yuggupta27@gmail.com>
This commit is contained in:
Yug 2021-06-08 11:03:29 +05:30 committed by mergify[bot]
parent 8d038db047
commit 33bf3fae6b
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
e2e/rbd_helper.go
View File

@ -234,7 +234,18 @@ func kmsIsVault(kms string) bool {
return kms == "vault" return kms == "vault"
} }
// nolint:gocyclo // reduce complexity func logErrors(f *framework.Framework, msg string, wgErrs []error) int {
failures := 0
for i, err := range wgErrs {
if err != nil {
// not using Failf() as it aborts the test and does not log other errors
e2elog.Logf("%s (%s%d): %v", msg, f.UniqueName, i, err)
failures++
}
}
return failures
}
func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc, destImagePool string) error { func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc, destImagePool string) error {
var wg sync.WaitGroup var wg sync.WaitGroup
totalCount := 10 totalCount := 10
@ -264,15 +275,7 @@ func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc,
} }
wg.Wait() wg.Wait()
failed := 0 if failed := logErrors(f, "failed to create snapshot", wgErrs); failed != 0 {
for i, err := range wgErrs {
if err != nil {
// not using Failf() as it aborts the test and does not log other errors
e2elog.Logf("failed to create snapshot (%s%d): %v", f.UniqueName, i, err)
failed++
}
}
if failed != 0 {
return fmt.Errorf("creating snapshots failed, %d errors were logged", failed) return fmt.Errorf("creating snapshots failed, %d errors were logged", failed)
} }
@ -311,14 +314,7 @@ func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc,
} }
wg.Wait() wg.Wait()
for i, err := range wgErrs { if failed := logErrors(f, "failed to create PVC and application", wgErrs); failed != 0 {
if err != nil {
// not using Failf() as it aborts the test and does not log other errors
e2elog.Logf("failed to create PVC and application (%s%d): %v", f.UniqueName, i, err)
failed++
}
}
if failed != 0 {
return fmt.Errorf("creating PVCs and applications failed, %d errors were logged", failed) return fmt.Errorf("creating PVCs and applications failed, %d errors were logged", failed)
} }
@ -343,14 +339,7 @@ func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc,
} }
wg.Wait() wg.Wait()
for i, err := range wgErrs { if failed := logErrors(f, "failed to delete PVC and application", wgErrs); failed != 0 {
if err != nil {
// not using Failf() as it aborts the test and does not log other errors
e2elog.Logf("failed to delete PVC and application (%s%d): %v", f.UniqueName, i, err)
failed++
}
}
if failed != 0 {
return fmt.Errorf("deleting PVCs and applications failed, %d errors were logged", failed) return fmt.Errorf("deleting PVCs and applications failed, %d errors were logged", failed)
} }
@ -373,14 +362,7 @@ func validateCloneInDifferentPool(f *framework.Framework, snapshotPool, cloneSc,
} }
wg.Wait() wg.Wait()
for i, err := range wgErrs { if failed := logErrors(f, "failed to delete snapshot", wgErrs); failed != 0 {
if err != nil {
// not using Failf() as it aborts the test and does not log other errors
e2elog.Logf("failed to delete snapshot (%s%d): %v", f.UniqueName, i, err)
failed++
}
}
if failed != 0 {
return fmt.Errorf("deleting snapshots failed, %d errors were logged", failed) return fmt.Errorf("deleting snapshots failed, %d errors were logged", failed)
} }
// validate all pools are empty // validate all pools are empty