mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-20 15:04:17 +00:00
* Update CRDs and CLI to support in-place restore (#10038) Update CRDs(Restore, DataDownload, PodVolumeRestore) and restore create CLI to support in-place restore Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> * Update Kopia(filesystem) uploader to support incremental and deleteExtraFile during restore (#10066) Update Kopia(filesystem) uploader to support incremental and deleteExtraFile during restore Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> * Update Restore Exposer and PVC CSI to support in-place restore (#10104) 1. Update Restore Exposer to support exposing with existing PV for in-place restore 2. Update PVC CSI RIA to continue the restore process for in-place restore Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> * Update Block uploader to support increase restore (#10244) Update Block uploader to support increase restore Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> * Update Exposer to recreate the target PV if the volume mode is different with the restore PVC (#10257) Update Exposer to recreate the target PV if the volume mode is different with t he restore PVC Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> * Preserve PVC selected-node annotation via carrier annotation for in-place restore For in-place volume data restore, the existing PVC is deleted and recreated. For StorageClasses with the WaitForFirstConsumer volume binding mode, losing the volume.kubernetes.io/selected-node annotation could let the scheduler place the recreated workload Pod in a different zone than the original PV, leaving it stuck in ContainerCreating. Instead of relying on RestoreItemAction execution order (the generic PVC RIA unconditionally strips the selected-node annotation), the PVC CSI RIA now captures the annotation from the existing PVC right before deleting it and carries it on the target PVC via the Velero-internal restore.velero.io/inplace-restore-selected-node annotation. The restore engine translates the carrier back to the Kubernetes annotation after all RestoreItemActions have run and always strips the carrier so it never lands on the cluster. This makes the behavior independent of RIA ordering: the Kubernetes annotation is stripped by default on every path (including when the target PVC does not exist and Velero falls back to provisioning a new PVC), and preservation only happens when the CSI RIA explicitly captured a value from the existing PVC. Signed-off-by: chlins <chlins.zhang@gmail.com> * Update the control path to make the in-place incremental restore with block data mover work E2E (#10410) Update the control path to make the in-place incremental restore with block data mover work E2E Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> --------- Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> Signed-off-by: chlins <chlins.zhang@gmail.com> Co-authored-by: chlins <chlins.zhang@gmail.com>
106 lines
3.2 KiB
Go
106 lines
3.2 KiB
Go
/*
|
|
Copyright the Velero contributors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package provider
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/cockroachdb/errors"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
corev1api "k8s.io/api/core/v1"
|
|
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/vmware-tanzu/velero/internal/credentials"
|
|
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
|
"github.com/vmware-tanzu/velero/pkg/cbtservice"
|
|
"github.com/vmware-tanzu/velero/pkg/uploader"
|
|
)
|
|
|
|
const restoreProgressCheckInterval = 10 * time.Second
|
|
const backupProgressCheckInterval = 10 * time.Second
|
|
|
|
var ErrorCanceled error = errors.New("uploader is canceled")
|
|
|
|
type CBTParam struct {
|
|
Source cbtservice.SourceInfo
|
|
Service cbtservice.Service
|
|
}
|
|
|
|
// Provider which is designed for one pod volume to do the backup or restore
|
|
type Provider interface {
|
|
// RunBackup which will do backup for one specific volume and return snapshotID, isSnapshotEmpty, error
|
|
// updater is used for updating backup progress which implement by third-party
|
|
RunBackup(
|
|
ctx context.Context,
|
|
path string,
|
|
realSource string,
|
|
tags map[string]string,
|
|
forceFull bool,
|
|
parentSnapshot string,
|
|
cbtParam CBTParam,
|
|
volMode uploader.PersistentVolumeMode,
|
|
uploaderCfg map[string]string,
|
|
updater uploader.ProgressUpdater) (string, bool, int64, int64, error)
|
|
// RunRestore which will do restore for one specific volume with given snapshot id and return error
|
|
// updater is used for updating backup progress which implement by third-party
|
|
RunRestore(
|
|
ctx context.Context,
|
|
snapshotID string,
|
|
volumePath string,
|
|
incremental bool,
|
|
cbtParam CBTParam,
|
|
volMode uploader.PersistentVolumeMode,
|
|
uploaderConfig map[string]string,
|
|
updater uploader.ProgressUpdater) (int64, error)
|
|
// Close which will close related repository
|
|
Close(ctx context.Context) error
|
|
}
|
|
|
|
// NewUploaderProvider initialize provider with specific uploaderType
|
|
func NewUploaderProvider(
|
|
ctx context.Context,
|
|
client client.Client,
|
|
uploaderType string,
|
|
requesterType string,
|
|
repoIdentifier string,
|
|
bsl *velerov1api.BackupStorageLocation,
|
|
backupRepo *velerov1api.BackupRepository,
|
|
credGetter *credentials.CredentialGetter,
|
|
repoKeySelector *corev1api.SecretKeySelector,
|
|
log logrus.FieldLogger,
|
|
) (Provider, error) {
|
|
if requesterType == "" {
|
|
return nil, errors.New("requester type is empty")
|
|
}
|
|
|
|
if credGetter.FromFile == nil {
|
|
return nil, errors.New("uninitialized FileStore credential is not supported")
|
|
}
|
|
|
|
switch uploaderType {
|
|
case uploader.KopiaType:
|
|
return NewKopiaUploaderProvider(requesterType, ctx, credGetter, backupRepo, log)
|
|
case uploader.BlockType:
|
|
return NewBlockUploaderProvider(requesterType, ctx, credGetter, backupRepo, log)
|
|
default:
|
|
return nil, errors.Errorf("unsupported uploader type %v", uploaderType)
|
|
}
|
|
}
|