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.

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

[cherry-pick][main]Make Windows build skip BlockMode code. #6989

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelogs/unreleased/6989-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.
3 changes: 3 additions & 0 deletions pkg/uploader/kopia/block_backup.go
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")
}
3 changes: 3 additions & 0 deletions pkg/uploader/kopia/block_restore.go
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")
}
Loading