X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..e8f38d1ce78e6466e0182852ba8adff3240f070c:/services/keep-balance/collection.go diff --git a/services/keep-balance/collection.go b/services/keep-balance/collection.go index 8f4ebb6bdf..1e5fa57978 100644 --- a/services/keep-balance/collection.go +++ b/services/keep-balance/collection.go @@ -36,7 +36,8 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection) } expectCount, err := countCollections(c, arvados.ResourceListParams{ - IncludeTrash: true, + IncludeTrash: true, + IncludeOldVersions: true, }) if err != nil { return err @@ -48,11 +49,12 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection) limit = 1<<31 - 1 } params := arvados.ResourceListParams{ - Limit: &limit, - Order: "modified_at, uuid", - Count: "none", - Select: []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"}, - IncludeTrash: true, + Limit: &limit, + Order: "modified_at, uuid", + Count: "none", + Select: []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"}, + IncludeTrash: true, + IncludeOldVersions: true, } var last arvados.Collection var filterTime time.Time @@ -140,7 +142,8 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection) Attr: "modified_at", Operator: "<=", Operand: filterTime}}, - IncludeTrash: true, + IncludeTrash: true, + IncludeOldVersions: true, }); err != nil { return err } else if callCount < checkCount {