MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 13:39:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle port as json.Number for DNS records in etcd (#8513)

Browse Source
This commit is contained in:
Harshavardhana
2019-11-12 14:42:35 -08:00
committed by GitHub
parent d97d53bddc
commit 2dad14974e
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bucket-handlers.go
View File

@@ -103,7 +103,7 @@ func initFederatorBackend(buckets []BucketInfo, objLayer ObjectLayer) {
}
// This is not for our server, so we can continue
hostPort := net.JoinHostPort(dnsBuckets[index].Host, dnsBuckets[index].Port)
hostPort := net.JoinHostPort(dnsBuckets[index].Host, string(dnsBuckets[index].Port))
if globalDomainIPs.Intersection(set.CreateStringSet(hostPort)).IsEmpty() {
return nil
}

4
cmd/object-api-utils.go
View File

@@ -328,7 +328,7 @@ func isMinioReservedBucket(bucketName string) bool {
func getHostsSlice(records []dns.SrvRecord) []string {
var hosts []string
for _, r := range records {
hosts = append(hosts, net.JoinHostPort(r.Host, r.Port))
hosts = append(hosts, net.JoinHostPort(r.Host, string(r.Port)))
}
return hosts
}
@@ -337,7 +337,7 @@ func getHostsSlice(records []dns.SrvRecord) []string {
func getHostFromSrv(records []dns.SrvRecord) string {
rand.Seed(time.Now().Unix())
srvRecord := records[rand.Intn(len(records))]
return net.JoinHostPort(srvRecord.Host, srvRecord.Port)
return net.JoinHostPort(srvRecord.Host, string(srvRecord.Port))
}
// IsCompressed returns true if the object is marked as compressed.