Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[oadp-1.2] OADP-2144: Resize cloned pvc based on cmp between cloned vs size and source pvc size #261

Merged
merged 7 commits into from
Aug 29, 2023
Merged

[oadp-1.2] OADP-2144: Resize cloned pvc based on cmp between cloned vs size and source pvc size #261

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e841172
reszie cloned pvc based on cmp between cloned vs size and source pvc …
shubham-pampattiwar Jul 7, 2023
8ba08d5
minor update
shubham-pampattiwar Jul 7, 2023
532eb90
harden the logic to resize
shubham-pampattiwar Jul 17, 2023
ff1b182
use VSC size instead of VS
shubham-pampattiwar Aug 1, 2023
a754fd6
minor fix
shubham-pampattiwar Aug 1, 2023
fa6161e
set cloned PVC storage request from clone VSC restoreSize
shubham-pampattiwar Aug 3, 2023
4a1691f
remove cu patch log statements
shubham-pampattiwar Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions controllers/pvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"errors"
"fmt"
"os"

k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
"os"

"github.com/go-logr/logr"
volsnapmoverv1alpha1 "github.com/konveyor/volume-snapshot-mover/api/v1alpha1"
Expand Down Expand Up @@ -71,7 +71,7 @@ func (r *VolumeSnapshotBackupReconciler) MirrorPVC(log logr.Logger) (bool, error

op, err := controllerutil.CreateOrUpdate(r.Context, r.Client, pvcClone, func() error {

return r.buildPVCClone(pvcClone, &vsClone)
return r.buildPVCClone(pvcClone, &vsClone, &vscClone)
})
if err != nil {
r.Log.Info(fmt.Sprintf("err building pvc clone: %v", err))
Expand All @@ -89,7 +89,7 @@ func (r *VolumeSnapshotBackupReconciler) MirrorPVC(log logr.Logger) (bool, error
return true, nil
}

func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.PersistentVolumeClaim, vsClone *snapv1.VolumeSnapshot) error {
func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.PersistentVolumeClaim, vsClone *snapv1.VolumeSnapshot, vscClone *snapv1.VolumeSnapshotContent) error {
sourcePVC, err := r.getSourcePVC()
if err != nil {
return err
Expand All @@ -106,6 +106,20 @@ func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.Persiste
return err
}

// check the size of source pvc with that of the cloned volumesnapshotcontent
// The cloned pvc provisioning will fail if the source pvc spec.resources.requests.storage value is less than the volumesnapshotcontent.status.restorSize value
// In order to tackle this problem we compare both the values and use the one that is maximum so that provisioning of cloned pvc does not fail
// currently we are keeping this pvc resizing a default behavior but this can be put behind a datamover feature boolean flag

clonedVSCRestoreSize := vscClone.Status.RestoreSize
sourcePVCRequestSize := sourcePVC.Spec.Resources.Requests.Storage()

clonedPVCSize, _ := sourcePVCRequestSize.AsInt64()
sourcePVCRequestSizeInt, _ := sourcePVCRequestSize.AsInt64()
if *clonedVSCRestoreSize > sourcePVCRequestSizeInt {
clonedPVCSize = *clonedVSCRestoreSize
}

if pvcClone.CreationTimestamp.IsZero() {
apiGroup := "snapshot.storage.k8s.io"
pvcClone.Spec.DataSource = &corev1.TypedLocalObjectReference{
Expand Down Expand Up @@ -142,7 +156,14 @@ func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.Persiste
pvcClone.Spec.StorageClassName = sourcePVC.Spec.StorageClassName
}

pvcClone.Spec.Resources = sourcePVC.Spec.Resources
// use the clonedPVCSize that is computed earlier
storageRequestValue := resource.NewQuantity(clonedPVCSize, resource.BinarySI)
pvcClone.Spec.Resources = corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: *storageRequestValue,
},
}
r.Log.Info(fmt.Sprintf("buildPVCClone: updated size for pvcClone: %v", pvcClone.Spec.Resources.Requests.Storage().Value()))
}

return nil
Expand Down Expand Up @@ -175,6 +196,8 @@ func (r *VolumeSnapshotBackupReconciler) BindPVCToDummyPod(log logr.Logger) (boo
return false, err
}

r.Log.Info(fmt.Sprintf("BindPVCToDummyPod: cloned PVC after building storage value:%v ", clonedPVC.Spec.Resources.Requests.Storage().Value()))

// Bind the above cloned PVC to a dummy pod
dp := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Expand Down