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

cherry: fix(export-backup): Don't ban namespace in export_backup #8099

Merged
merged 1 commit into from
Nov 30, 2021
+4 −0
Merged

cherry: fix(export-backup): Don't ban namespace in export_backup #8099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions worker/restore_map.go
View file
Original file line number Diff line number Diff line change
@@ -796,6 +796,10 @@ func RunMapper(req *pb.RestoreRequest, mapDir string) (*mapResult, error) {
case pb.DropOperation_ATTR:
dropAttr[op.DropValue] = struct{}{}
case pb.DropOperation_NS:
// pstore will be nil for export_backup tool. In that case we don't need to ban ns.
if pstore == nil {
continue
}
// If there is a drop namespace, we just ban the namespace in the pstore.
ns, err := strconv.ParseUint(op.DropValue, 0, 64)
if err != nil {