From a30f5d7ec07017e08dbe9aa34d3801ff2f455b0f Mon Sep 17 00:00:00 2001 From: Kaloyan Raev Date: Wed, 18 Nov 2020 13:16:00 +0200 Subject: [PATCH] satellite/metainfo: use Object.Status from ObjectListRequest Change-Id: Ie2e48d2eedf69bd0f04b7c9d6e7e217fec6b0267 --- satellite/metainfo/metainfo.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/satellite/metainfo/metainfo.go b/satellite/metainfo/metainfo.go index 16486c0db..990502782 100644 --- a/satellite/metainfo/metainfo.go +++ b/satellite/metainfo/metainfo.go @@ -961,6 +961,12 @@ func (endpoint *Endpoint) ListObjects(ctx context.Context, req *pb.ObjectListReq } } + // Default to Commmitted status for backward-compatibility with older uplinks. + status := metabase.Committed + if req.Status != pb.Object_INVALID { + status = metabase.ObjectStatus(req.Status) + } + resp = &pb.ObjectListResponse{} // TODO: Replace with IterateObjectsLatestVersion when ready err = endpoint.metainfo.metabaseDB.IterateObjectsAllVersions(ctx, @@ -971,7 +977,7 @@ func (endpoint *Endpoint) ListObjects(ctx context.Context, req *pb.ObjectListReq Cursor: metabase.IterateCursor{Key: metabase.ObjectKey(req.EncryptedCursor)}, Recursive: req.Recursive, BatchSize: limit + 1, - Status: metabase.Committed, + Status: status, }, func(ctx context.Context, it metabase.ObjectsIterator) error { entry := metabase.ObjectEntry{} for len(resp.Items) < limit && it.Next(ctx, &entry) {