X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/023798117b11e4c3f3b68003999dd6d27c9d131e..d44a5c508cfa664134daad806d7be9a7cb0bd6ee:/services/datamanager/datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 339a54106a..a2edc7be2f 100644
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -7,6 +7,7 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/util"
 	"git.curoverse.com/arvados.git/services/datamanager/collection"
+	"git.curoverse.com/arvados.git/services/datamanager/keep"
 	"log"
 )
 
@@ -41,21 +42,8 @@ func main() {
 	log.Printf("Read and processed %d collections",
 		len(readCollections.UuidToCollection))
 
-	// TODO(misha): Send SDK and Keep requests in parallel
+	readServers := keep.GetKeepServers(
+		keep.GetKeepServersParams{Client: arv, Limit: 1000})
 
-	keepParams := arvadosclient.Dict{"limit": 1000}
-	var keepDisks map[string]interface{}
-	err = arv.List("keep_disks", keepParams, &keepDisks)
-	if err != nil {
-		log.Fatalf("Error requesting keep disks from API server: %v", err)
-	}
-	var retrievedAll bool
-	var numDisksReturned, numDisksAvailable int
-	if retrievedAll, numDisksReturned, numDisksAvailable =
-		util.SdkListResponseContainsAllAvailableItems(keepDisks); !retrievedAll {
-		log.Fatalf("Failed to retrieve all keep disks. Only received %d of %d",
-			numDisksReturned, numDisksAvailable)
-	}
-
-	log.Printf("Returned %d keep disks", numDisksReturned)
+	log.Printf("Returned %d keep disks", len(readServers.AddressToContents))
 }