From 49a5c505d8b85534194cefe7a5e8f6be992c0361 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Fri, 20 Oct 2023 15:43:42 +0800 Subject: [PATCH] Make Windows build skip BlockMode code. PVC block mode backup and restore introduced some OS specific system calls. Those calls are not availble for Windows, so add both non Windows version and Windows version code, and return error for block mode on Windows platform. Signed-off-by: Xun Jiang --- changelogs/unreleased/6986-blackpiglet | 1 + ...k_backup.go => block_backup_nonwindows.go} | 3 ++ pkg/uploader/kopia/block_backup_windows.go | 30 +++++++++++++ ...restore.go => block_restore_nonwindows.go} | 3 ++ pkg/uploader/kopia/block_restore_windows.go | 42 +++++++++++++++++++ pkg/uploader/kopia/snapshot.go | 6 +++ 6 files changed, 85 insertions(+) create mode 100644 changelogs/unreleased/6986-blackpiglet rename pkg/uploader/kopia/{block_backup.go => block_backup_nonwindows.go} (97%) create mode 100644 pkg/uploader/kopia/block_backup_windows.go rename pkg/uploader/kopia/{block_restore.go => block_restore_nonwindows.go} (98%) create mode 100644 pkg/uploader/kopia/block_restore_windows.go diff --git a/changelogs/unreleased/6986-blackpiglet b/changelogs/unreleased/6986-blackpiglet new file mode 100644 index 0000000000..4eae63eaee --- /dev/null +++ b/changelogs/unreleased/6986-blackpiglet @@ -0,0 +1 @@ +Add both non-Windows version and Windows version code for PVC block mode logic. \ No newline at end of file diff --git a/pkg/uploader/kopia/block_backup.go b/pkg/uploader/kopia/block_backup_nonwindows.go similarity index 97% rename from pkg/uploader/kopia/block_backup.go rename to pkg/uploader/kopia/block_backup_nonwindows.go index a637925a49..ad90b723fc 100644 --- a/pkg/uploader/kopia/block_backup.go +++ b/pkg/uploader/kopia/block_backup_nonwindows.go @@ -1,3 +1,6 @@ +//go:build !windows +// +build !windows + /* Copyright The Velero Contributors. diff --git a/pkg/uploader/kopia/block_backup_windows.go b/pkg/uploader/kopia/block_backup_windows.go new file mode 100644 index 0000000000..e6b928456b --- /dev/null +++ b/pkg/uploader/kopia/block_backup_windows.go @@ -0,0 +1,30 @@ +//go:build windows +// +build windows + +/* +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 kopia + +import ( + "fmt" + + "github.com/kopia/kopia/fs" +) + +func getLocalBlockEntry(sourcePath string) (fs.Entry, error) { + return nil, fmt.Errorf("block mode is not supported for Windows") +} diff --git a/pkg/uploader/kopia/block_restore.go b/pkg/uploader/kopia/block_restore_nonwindows.go similarity index 98% rename from pkg/uploader/kopia/block_restore.go rename to pkg/uploader/kopia/block_restore_nonwindows.go index 25d11ee24e..22c8ec1fcb 100644 --- a/pkg/uploader/kopia/block_restore.go +++ b/pkg/uploader/kopia/block_restore_nonwindows.go @@ -1,3 +1,6 @@ +//go:build !windows +// +build !windows + /* Copyright The Velero Contributors. diff --git a/pkg/uploader/kopia/block_restore_windows.go b/pkg/uploader/kopia/block_restore_windows.go new file mode 100644 index 0000000000..ff6e726c87 --- /dev/null +++ b/pkg/uploader/kopia/block_restore_windows.go @@ -0,0 +1,42 @@ +//go:build windows +// +build windows + +/* +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 kopia + +import ( + "context" + "fmt" + + "github.com/kopia/kopia/fs" + "github.com/kopia/kopia/snapshot/restore" +) + +type BlockOutput struct { + *restore.FilesystemOutput + + targetFileName string +} + +func (o *BlockOutput) WriteFile(ctx context.Context, relativePath string, remoteFile fs.File) error { + return fmt.Errorf("block mode is not supported for Windows") +} + +func (o *BlockOutput) BeginDirectory(ctx context.Context, relativePath string, e fs.Directory) error { + return fmt.Errorf("block mode is not supported for Windows") +} diff --git a/pkg/uploader/kopia/snapshot.go b/pkg/uploader/kopia/snapshot.go index 27ac842532..ca76b7fd36 100644 --- a/pkg/uploader/kopia/snapshot.go +++ b/pkg/uploader/kopia/snapshot.go @@ -160,6 +160,9 @@ func Backup(ctx context.Context, fsUploader SnapshotUploader, repoWriter repo.Re var sourceEntry fs.Entry if volMode == uploader.PersistentVolumeBlock { + if runtime.GOOS == "windows" { + return nil, false, fmt.Errorf("Block mode is not supported in Windows.") + } sourceEntry, err = getLocalBlockEntry(source) if err != nil { return nil, false, errors.Wrap(err, "unable to get local block device entry") @@ -392,6 +395,9 @@ func Restore(ctx context.Context, rep repo.RepositoryWriter, progress *Progress, var output restore.Output = fsOutput if volMode == uploader.PersistentVolumeBlock { + if runtime.GOOS == "windows" { + return 0, 0, fmt.Errorf("Block mode is not supported on Windows.") + } output = &BlockOutput{ FilesystemOutput: fsOutput, }