From 13bddf159a9f39c5d81b5d68402ae8c2f76d0cdb Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 25 Feb 2021 11:45:35 -0500 Subject: [PATCH] 17119: make arvados_fuse.fusedir.ProjectDirectory use the group contents endpoint. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- services/fuse/arvados_fuse/fusedir.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py index db5020cfef..1fab2e0fb8 100644 --- a/services/fuse/arvados_fuse/fusedir.py +++ b/services/fuse/arvados_fuse/fusedir.py @@ -894,14 +894,16 @@ class ProjectDirectory(Directory): elif user_uuid_pattern.match(self.project_uuid): self.project_object = self.api.users().get( uuid=self.project_uuid).execute(num_retries=self.num_retries) - - contents = arvados.util.list_all(self.api.groups().list, + # do this in 2 steps until #17424 is fixed + contents = arvados.util.list_all(self.api.groups().contents, self.num_retries, - filters=[["owner_uuid", "=", self.project_uuid], + uuid=self.project_uuid, + filters=[["uuid", "is_a", "arvados#group"], ["group_class", "=", "project"]]) - contents.extend(arvados.util.list_all(self.api.collections().list, + contents.extend(arvados.util.list_all(self.api.groups().contents, self.num_retries, - filters=[["owner_uuid", "=", self.project_uuid]])) + uuid=self.project_uuid, + filters=[["uuid", "is_a", "arvados#collection"]])) # end with llfuse.lock_released, re-acquire lock -- 2.30.2