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: reformat long lines in this package to 120 chars

Browse Source 
We have many declarations and invocations..etc with long lines which are
very difficult to follow while doing code reading. This address the issues
in 'e2e/resize.go' files to restrict the line length to 120 chars.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2021-06-25 18:25:46 +05:30 committed by mergify[bot]
parent 1849887b40
commit 7aa53350ff
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
e2e/resize.go
View File

@ -20,21 +20,27 @@ import (
func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size string, t int) error { func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size string, t int) error {
pvcName := pvc.Name pvcName := pvc.Name
updatedPVC, err := c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvcName, metav1.GetOptions{}) updatedPVC, err := c.CoreV1().
PersistentVolumeClaims(pvc.Namespace).
Get(context.TODO(), pvcName, metav1.GetOptions{})
if err != nil { if err != nil {
return fmt.Errorf("error fetching pvc %q with %w", pvcName, err) return fmt.Errorf("error fetching pvc %q with %w", pvcName, err)
} }
timeout := time.Duration(t) * time.Minute timeout := time.Duration(t) * time.Minute
updatedPVC.Spec.Resources.Requests[v1.ResourceStorage] = resource.MustParse(size) updatedPVC.Spec.Resources.Requests[v1.ResourceStorage] = resource.MustParse(size)
_, err = c.CoreV1().PersistentVolumeClaims(updatedPVC.Namespace).Update(context.TODO(), updatedPVC, metav1.UpdateOptions{}) _, err = c.CoreV1().
PersistentVolumeClaims(updatedPVC.Namespace).
Update(context.TODO(), updatedPVC, metav1.UpdateOptions{})
Expect(err).Should(BeNil()) Expect(err).Should(BeNil())
start := time.Now() start := time.Now()
e2elog.Logf("Waiting up to %v to be in Resized state", pvc) e2elog.Logf("Waiting up to %v to be in Resized state", pvc)
return wait.PollImmediate(poll, timeout, func() (bool, error) { return wait.PollImmediate(poll, timeout, func() (bool, error) {
e2elog.Logf("waiting for PVC %s (%d seconds elapsed)", updatedPVC.Name, int(time.Since(start).Seconds())) e2elog.Logf("waiting for PVC %s (%d seconds elapsed)", updatedPVC.Name, int(time.Since(start).Seconds()))
updatedPVC, err = c.CoreV1().PersistentVolumeClaims(updatedPVC.Namespace).Get(context.TODO(), pvcName, metav1.GetOptions{}) updatedPVC, err = c.CoreV1().
PersistentVolumeClaims(updatedPVC.Namespace).
Get(context.TODO(), pvcName, metav1.GetOptions{})
if err != nil { if err != nil {
e2elog.Logf("Error getting pvc in namespace: '%s': %v", updatedPVC.Namespace, err) e2elog.Logf("Error getting pvc in namespace: '%s': %v", updatedPVC.Namespace, err)
if isRetryableAPIError(err) { if isRetryableAPIError(err) {
@ -45,13 +51,17 @@ func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size s
pvcConditions := updatedPVC.Status.Conditions pvcConditions := updatedPVC.Status.Conditions
if len(pvcConditions) > 0 { if len(pvcConditions) > 0 {
e2elog.Logf("pvc state %v", pvcConditions[0].Type) e2elog.Logf("pvc state %v", pvcConditions[0].Type)
if pvcConditions[0].Type == v1.PersistentVolumeClaimResizing || pvcConditions[0].Type == v1.PersistentVolumeClaimFileSystemResizePending { if pvcConditions[0].Type == v1.PersistentVolumeClaimResizing ||
pvcConditions[0].Type == v1.PersistentVolumeClaimFileSystemResizePending {
return false, nil return false, nil
} }
} }
if !updatedPVC.Status.Capacity[v1.ResourceStorage].Equal(resource.MustParse(size)) { if !updatedPVC.Status.Capacity[v1.ResourceStorage].Equal(resource.MustParse(size)) {
e2elog.Logf("current size in status %v,expected size %v", updatedPVC.Status.Capacity[v1.ResourceStorage], resource.MustParse(size)) e2elog.Logf(
"current size in status %v,expected size %v",
updatedPVC.Status.Capacity[v1.ResourceStorage],
resource.MustParse(size))
return false, nil return false, nil
} }
return true, nil return true, nil
@ -90,7 +100,9 @@ func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) e
LabelSelector: "app=resize-pvc", LabelSelector: "app=resize-pvc",
} }
pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{}) pvc, err = f.ClientSet.CoreV1().
PersistentVolumeClaims(pvc.Namespace).
Get(context.TODO(), pvc.Name, metav1.GetOptions{})
if err != nil { if err != nil {
return fmt.Errorf("failed to get pvc: %w", err) return fmt.Errorf("failed to get pvc: %w", err)
} }