6260: look for two replicas

[arvados.git] / services / datamanager / summary / summary.go

diff --git a/services/datamanager/summary/summary.go b/services/datamanager/summary/summary.go
index 8621d550dbda9c5e6dab5c4481f0a57484daa328..edd760b035d066627b51f913799bb2606f4c0141 100644 (file)
--- a/services/datamanager/summary/summary.go
+++ b/services/datamanager/summary/summary.go
@@ -11,10 +11,10 @@ import (
        "sort"
 )
 
-type BlockSet map[blockdigest.BlockDigest]struct{}
+type BlockSet map[blockdigest.DigestWithSize]struct{}
 
 // Adds a single block to the set.
-func (bs BlockSet) Insert(digest blockdigest.BlockDigest) {
+func (bs BlockSet) Insert(digest blockdigest.DigestWithSize) {
        bs[digest] = struct{}{}
 }
 
@@ -112,7 +112,7 @@ func (rlbs ReplicationLevelBlockSetMap) GetOrCreate(
 // Adds a block to the set for a given replication level.
 func (rlbs ReplicationLevelBlockSetMap) Insert(
        repLevels ReplicationLevels,
-       block blockdigest.BlockDigest) {
+       block blockdigest.DigestWithSize) {
        rlbs.GetOrCreate(repLevels).Insert(block)
 }
 
@@ -196,7 +196,7 @@ func BucketReplication(readCollections collection.ReadCollections,
        keepServerInfo keep.ReadServers) (rlbsm ReplicationLevelBlockSetMap) {
        rlbsm = make(ReplicationLevelBlockSetMap)
 
-       for block, requestedReplication := range readCollections.BlockToReplication {
+       for block, requestedReplication := range readCollections.BlockToDesiredReplication {
                rlbsm.Insert(
                        ReplicationLevels{
                                Requested: requestedReplication,
@@ -205,7 +205,7 @@ func BucketReplication(readCollections collection.ReadCollections,
        }
 
        for block, servers := range keepServerInfo.BlockToServers {
-               if 0 == readCollections.BlockToReplication[block] {
+               if 0 == readCollections.BlockToDesiredReplication[block] {
                        rlbsm.Insert(
                                ReplicationLevels{Requested: 0, Actual: len(servers)},
                                block)