X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0dd85fcd31ef5f251dcf143fef4118d6ea56f700..44321d4b5e7677df2ad70d88db6358b2778b58e5:/services/datamanager/summary/pull_list.go diff --git a/services/datamanager/summary/pull_list.go b/services/datamanager/summary/pull_list.go index d2eef9316b..b326c9521a 100644 --- a/services/datamanager/summary/pull_list.go +++ b/services/datamanager/summary/pull_list.go @@ -94,7 +94,7 @@ func ComputePullServers(kc *keepclient.KeepClient, serverHasBlock := map[string]struct{}{} for _, info := range serversStoringBlock { sa := keepServerInfo.KeepServerIndexToAddress[info.ServerIndex] - serverHasBlock[cs.Get(sa.HostPort())] = struct{}{} + serverHasBlock[cs.Get(sa.URL())] = struct{}{} } roots := keepclient.NewRootSorter(kc.LocalRoots(), @@ -126,7 +126,7 @@ func CreatePullServers(cs CanonicalString, for _, host := range sortedServers { // Strip the protocol portion of the url. // Use the canonical copy of the string to avoid memory waste. - server := cs.Get(RemoveProtocolPrefix(host)) + server := cs.Get(host) _, hasBlock := serverHasBlock[server] if hasBlock { // The from field should include the protocol. @@ -175,7 +175,7 @@ func WritePullLists(arvLogger *logger.Logger, pullLists map[string]PullList) { r := strings.NewReplacer(":", ".") for host, list := range pullLists { - filename := fmt.Sprintf("pull_list.%s", r.Replace(host)) + filename := fmt.Sprintf("pull_list.%s", r.Replace(RemoveProtocolPrefix(host))) pullListFile, err := os.Create(filename) if err != nil { loggerutil.FatalWithMessage(arvLogger,