X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..90a750e42e27ee5cfdffa65ba675b19005cbb345:/services/keep-balance/collection.go

diff --git a/services/keep-balance/collection.go b/services/keep-balance/collection.go
index 8f4ebb6bdf..534928bc82 100644
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@ -36,23 +36,37 @@ 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
 	}
 
+	// Note the obvious way to get all collections (sorting by
+	// UUID) would be much easier, but would lose data: If a
+	// client were to move files from collection with uuid="zzz"
+	// to a collection with uuid="aaa" around the time when we
+	// were fetching the "mmm" page, we would never see those
+	// files' block IDs at all -- even if the client is careful to
+	// save "aaa" before saving "zzz".
+	//
+	// Instead, we get pages in modified_at order. Collections
+	// that are modified during the run will be re-fetched in a
+	// subsequent page.
+
 	limit := pageSize
 	if limit <= 0 {
 		// Use the maximum page size the server allows
 		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 +154,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 {