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

sync: skip listing on dst in force mode #4602

Merged
merged 1 commit into from
Mar 28, 2024
Merged

sync: skip listing on dst in force mode #4602

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
31 changes: 22 additions & 9 deletions pkg/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,11 +759,17 @@ func startSingleProducer(tasks chan<- object.Object, src, dst object.ObjectStora
return fmt.Errorf("list %s: %s", src, err)
}

dstkeys, err := ListAll(dst, prefix, start, end, !config.Links)
if err != nil {
return fmt.Errorf("list %s: %s", dst, err)
var dstkeys <-chan object.Object
if config.ForceUpdate {
t := make(chan object.Object)
close(t)
dstkeys = t
} else {
dstkeys, err = ListAll(dst, prefix, start, end, !config.Links)
if err != nil {
return fmt.Errorf("list %s: %s", dst, err)
}
}

produce(tasks, srckeys, dstkeys, config)
return nil
}
Expand Down Expand Up @@ -1167,11 +1173,18 @@ func startProducer(tasks chan<- object.Object, src, dst object.ObjectStorage, pr
if config.DeleteDst {
dcp = commonPrefix // search common prefix in dst
}
dstkeys, err := listCommonPrefix(dst, prefix, dcp, !config.Links)
if err == utils.ENOTSUP {
return startSingleProducer(tasks, src, dst, prefix, config)
} else if err != nil {
return fmt.Errorf("list %s with delimiter: %s", dst, err)
var dstkeys <-chan object.Object
if config.ForceUpdate {
t := make(chan object.Object)
close(t)
dstkeys = t
} else {
dstkeys, err = listCommonPrefix(dst, prefix, dcp, !config.Links)
if err == utils.ENOTSUP {
return startSingleProducer(tasks, src, dst, prefix, config)
} else if err != nil {
return fmt.Errorf("list %s with delimiter: %s", dst, err)
}
}
// sync returned objects
produce(tasks, srckeys, dstkeys, config)
Expand Down
Loading