Skip to content

object/ceph: fix listAll #1891

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

Merged
merged 2 commits into from
Apr 25, 2022
Merged

object/ceph: fix listAll #1891

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488d627
object/ceph: fix listAll
SandyXSD Apr 25, 2022
e911f92
skip non-existent key
SandyXSD Apr 25, 2022
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
23 changes: 16 additions & 7 deletions pkg/object/ceph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ func (c *ceph) Delete(key string) error {
func (c *ceph) ListAll(prefix, marker string) (<-chan Object, error) {
var objs = make(chan Object, 1000)
err := c.do(func(ctx *rados.IOContext) error {
defer close(objs)
iter, err := ctx.Iter()
if err != nil {
close(objs)
return err
}
defer iter.Close()
Expand All @@ -188,13 +188,22 @@ func (c *ceph) ListAll(prefix, marker string) (<-chan Object, error) {
// the keys are not ordered, sort them first
sort.Strings(keys)
// TODO: parallel
for _, key := range keys {
st, err := ctx.Stat(key)
if err != nil {
continue // FIXME
go func() {
defer close(objs)
for _, key := range keys {
st, err := ctx.Stat(key)
if err != nil {
if errors.Is(err, rados.ErrNotFound) {
logger.Warnf("Skip non-existent key: %s", key)
continue
}
objs <- nil
logger.Errorf("Stat key %s: %s", key, err)
return
}
objs <- &obj{key, int64(st.Size), st.ModTime, strings.HasSuffix(key, "/")}
}
objs <- &obj{key, int64(st.Size), st.ModTime, strings.HasSuffix(key, "/")}
}
}()
return nil
})
return objs, err
Expand Down