X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9bf39b18d1e161b6b971270d15c1024ece86243..5e27876fa4d3faf3b973282bfb4f152c02345bdc:/services/datamanager/datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 301aa81f4e..91612668b5 100644
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -79,30 +79,19 @@ func singlerun() {
 	}
 
 	var (
+		dataFetcher     summary.DataFetcher
 		readCollections collection.ReadCollections
 		keepServerInfo  keep.ReadServers
 	)
 
-	if !summary.MaybeReadData(arvLogger, &readCollections, &keepServerInfo) {
-		collectionChannel := make(chan collection.ReadCollections)
-
-		go func() {
-			collectionChannel <- collection.GetCollectionsAndSummarize(
-				collection.GetCollectionsParams{
-					Client:    arv,
-					Logger:    arvLogger,
-					BatchSize: 50})
-		}()
-
-		keepServerInfo = keep.GetKeepServersAndSummarize(
-			keep.GetKeepServersParams{
-				Client: arv,
-				Logger: arvLogger,
-				Limit:  1000})
-
-		readCollections = <-collectionChannel
+	if summary.ShouldReadData() {
+		dataFetcher = summary.ReadData
+	} else {
+		dataFetcher = BuildDataFetcher(arv)
 	}
 
+	dataFetcher(arvLogger, &readCollections, &keepServerInfo)
+
 	summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
 
 	buckets := summary.BucketReplication(readCollections, keepServerInfo)
@@ -113,7 +102,7 @@ func singlerun() {
 
 	log.Printf("Blocks In Collections: %d, "+
 		"\nBlocks In Keep: %d.",
-		len(readCollections.BlockToReplication),
+		len(readCollections.BlockToDesiredReplication),
 		len(keepServerInfo.BlockToServers))
 	log.Println(replicationCounts.PrettyPrint())
 
@@ -130,9 +119,9 @@ func singlerun() {
 			fmt.Sprintf("Error setting up keep client %s", err.Error()))
 	}
 
-	pullServers := summary.ComputePullServers(&kc,
+	pullServers := summary.ComputePullServers(kc,
 		&keepServerInfo,
-		readCollections.BlockToReplication,
+		readCollections.BlockToDesiredReplication,
 		replicationSummary.UnderReplicatedBlocks)
 
 	pullLists := summary.BuildPullLists(pullServers)
@@ -152,3 +141,28 @@ func singlerun() {
 		})
 	}
 }
+
+// Returns a data fetcher that fetches data from remote servers.
+func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
+	return func(arvLogger *logger.Logger,
+		readCollections *collection.ReadCollections,
+		keepServerInfo *keep.ReadServers) {
+		collectionChannel := make(chan collection.ReadCollections)
+
+		go func() {
+			collectionChannel <- collection.GetCollectionsAndSummarize(
+				collection.GetCollectionsParams{
+					Client:    arv,
+					Logger:    arvLogger,
+					BatchSize: 50})
+		}()
+
+		*keepServerInfo = keep.GetKeepServersAndSummarize(
+			keep.GetKeepServersParams{
+				Client: arv,
+				Logger: arvLogger,
+				Limit:  1000})
+
+		*readCollections = <-collectionChannel
+	}
+}