From 4d08393b7ca8b1a34ed65532955de76cf8843ec2 Mon Sep 17 00:00:00 2001 From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> Date: Fri, 5 Aug 2022 05:35:00 +0500 Subject: filer prefer volume server in same data center (#3405) * initial prefer same data center https://github.com/seaweedfs/seaweedfs/issues/3404 * GetDataCenter * prefer same data center for ReplicationSource * GetDataCenterId * remove glog --- weed/replication/source/filer_source.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'weed/replication/source/filer_source.go') diff --git a/weed/replication/source/filer_source.go b/weed/replication/source/filer_source.go index f6b310355..6c69b735c 100644 --- a/weed/replication/source/filer_source.go +++ b/weed/replication/source/filer_source.go @@ -27,9 +27,11 @@ type FilerSource struct { Dir string address string proxyByFiler bool + dataCenter string } func (fs *FilerSource) Initialize(configuration util.Configuration, prefix string) error { + fs.dataCenter = configuration.GetString(prefix + "dataCenter") return fs.DoInitialize( "", configuration.GetString(prefix+"grpcAddress"), @@ -84,7 +86,13 @@ func (fs *FilerSource) LookupFileId(part string) (fileUrls []string, err error) if !fs.proxyByFiler { for _, loc := range locations.Locations { - fileUrls = append(fileUrls, fmt.Sprintf("http://%s/%s?readDeleted=true", loc.Url, part)) + fileUrl := fmt.Sprintf("http://%s/%s?readDeleted=true", loc.Url, part) + // Prefer same data center + if fs.dataCenter != "" && fs.dataCenter == loc.DataCenter { + fileUrls = append([]string{fileUrl}, fileUrls...) + } else { + fileUrls = append(fileUrls, fileUrl) + } } } else { fileUrls = append(fileUrls, fmt.Sprintf("http://%s/?proxyChunkId=%s", fs.address, part)) @@ -131,6 +139,10 @@ func (fs *FilerSource) AdjustedUrl(location *filer_pb.Location) string { return location.Url } +func (fs *FilerSource) GetDataCenter() string { + return fs.dataCenter +} + func volumeId(fileId string) string { lastCommaIndex := strings.LastIndex(fileId, ",") if lastCommaIndex > 0 { -- cgit v1.2.3