Skip to content

Commit

Permalink
Make Windows build skip BlockMode code.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Xun Jiang committed Oct 20, 2023
1 parent 353ff55 commit 49a5c50
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelogs/unreleased/6986-blackpiglet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add both non-Windows version and Windows version code for PVC block mode logic.
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build !windows
// +build !windows

/*
Copyright The Velero Contributors.
Expand Down
30 changes: 30 additions & 0 deletions pkg/uploader/kopia/block_backup_windows.go
Original file line number Diff line number Diff line change
@@ -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")
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build !windows
// +build !windows

/*
Copyright The Velero Contributors.
Expand Down
42 changes: 42 additions & 0 deletions pkg/uploader/kopia/block_restore_windows.go
Original file line number Diff line number Diff line change
@@ -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")
}
6 changes: 6 additions & 0 deletions pkg/uploader/kopia/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
}

Check warning on line 165 in pkg/uploader/kopia/snapshot.go

View check run for this annotation

Codecov / codecov/patch

pkg/uploader/kopia/snapshot.go#L164-L165

Added lines #L164 - L165 were not covered by tests
sourceEntry, err = getLocalBlockEntry(source)
if err != nil {
return nil, false, errors.Wrap(err, "unable to get local block device entry")
Expand Down Expand Up @@ -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.")
}

Check warning on line 400 in pkg/uploader/kopia/snapshot.go

View check run for this annotation

Codecov / codecov/patch

pkg/uploader/kopia/snapshot.go#L399-L400

Added lines #L399 - L400 were not covered by tests
output = &BlockOutput{
FilesystemOutput: fsOutput,
}
Expand Down

0 comments on commit 49a5c50

Please sign in to comment.