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

Add e2e tests for RBD resizer

Browse Source 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2019-11-27 17:45:49 +05:30 committed by mergify[bot]
parent 7e59c0ed78
commit e69f462336
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
e2e/rbd.go
View File

@ -236,6 +236,24 @@ var _ = Describe("RBD", func() {
} }
}) })
By("Resize PVC and check application directory size", func() {
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Logf("failed to get server version with error %v", err)
Fail(err.Error())
}
// Resize 0.3.0 is only supported from v1.15+
if v.Major > "1" || (v.Major == "1" && v.Minor >= "15") {
err := resizePVCAndValidateSize(pvcPath, appPath, f)
if err != nil {
e2elog.Logf("failed to resize PVC %v", err)
Fail(err.Error())
}
}
})
By("Test unmount after nodeplugin restart", func() { By("Test unmount after nodeplugin restart", func() {
pvc, err := loadPVC(pvcPath) pvc, err := loadPVC(pvcPath)
if err != nil { if err != nil {

18
e2e/utils.go
View File

@ -24,6 +24,7 @@ import (
utilyaml "k8s.io/apimachinery/pkg/util/yaml" utilyaml "k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/cloud-provider/volume/helpers"
"k8s.io/kubernetes/pkg/client/conditions" "k8s.io/kubernetes/pkg/client/conditions"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2elog "k8s.io/kubernetes/test/e2e/framework/log"
@ -843,6 +844,8 @@ func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size s
} }
func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) error { func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) error {
size := "1Gi"
expandSize := "10Gi"
pvc, err := loadPVC(pvcPath) pvc, err := loadPVC(pvcPath)
if pvc == nil { if pvc == nil {
return err return err
@ -859,6 +862,7 @@ func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) e
if err != nil { if err != nil {
return err return err
} }
pvc.Spec.Resources.Requests[v1.ResourceStorage] = resource.MustParse(size)
app.Labels = map[string]string{"app": "resize-pvc"} app.Labels = map[string]string{"app": "resize-pvc"}
app.Namespace = f.UniqueName app.Namespace = f.UniqueName
@ -870,13 +874,12 @@ func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) e
opt := metav1.ListOptions{ opt := metav1.ListOptions{
LabelSelector: "app=resize-pvc", LabelSelector: "app=resize-pvc",
} }
err = checkDirSize(app, f, &opt, size, deployTimeout)
err = checkDirSize(app, f, &opt, "5.0G", deployTimeout)
if err != nil { if err != nil {
return err return err
} }
// resize PVC // resize PVC
err = expandPVCSize(f.ClientSet, resizePvc, "10Gi", deployTimeout) err = expandPVCSize(f.ClientSet, resizePvc, expandSize, deployTimeout)
if err != nil { if err != nil {
return err return err
} }
@ -885,7 +888,7 @@ func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) e
if err != nil { if err != nil {
return err return err
} }
err = checkDirSize(app, f, &opt, "10G", deployTimeout) err = checkDirSize(app, f, &opt, expandSize, deployTimeout)
return err return err
} }
@ -902,8 +905,13 @@ func checkDirSize(app *v1.Pod, f *framework.Framework, opt *metav1.ListOptions,
e2elog.Logf("failed to execute command in app pod %v", stdErr) e2elog.Logf("failed to execute command in app pod %v", stdErr)
return false, nil return false, nil
} }
s := resource.MustParse(strings.TrimSpace(output))
actualSize := helpers.RoundUpToGiB(s)
if !strings.Contains(output, size) { s = resource.MustParse(size)
expectedSize := helpers.RoundUpToGiB(s)
if actualSize != expectedSize {
e2elog.Logf("expected directory size %s found %s information", size, output) e2elog.Logf("expected directory size %s found %s information", size, output)
return false, nil return false, nil
} }