aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorKonstantin Lebedev <lebedev_k@tochka.com>2020-11-12 02:13:33 +0500
committerKonstantin Lebedev <lebedev_k@tochka.com>2020-11-12 02:13:33 +0500
commitfc7baef5bb58caa454deb6ea0376a8bd516aa080 (patch)
tree059310f4a2ed78c57ce6c84ea9d33811c5d1502a /weed/server
parentb73ef6aa95399a30b54cd43260945cbe14e49457 (diff)
downloadseaweedfs-fc7baef5bb58caa454deb6ea0376a8bd516aa080.tar.xz
seaweedfs-fc7baef5bb58caa454deb6ea0376a8bd516aa080.zip
fiil serverUrls sorted by data center
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/filer_server.go2
-rw-r--r--weed/server/master_server.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index 065bb3251..dc93ae062 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -89,7 +89,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption)
glog.Fatal("master list is required!")
}
- fs.filer = filer.NewFiler(option.Masters, fs.grpcDialOption, option.Host, option.Port, option.Collection, option.DefaultReplication, func() {
+ fs.filer = filer.NewFiler(option.Masters, fs.grpcDialOption, option.Host, option.Port, option.Collection, option.DefaultReplication, option.DataCenter, func() {
fs.listenersCond.Broadcast()
})
fs.filer.Cipher = option.Cipher
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index cc1c4b2ad..ccc94ebac 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -93,7 +93,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste
preallocateSize: preallocateSize,
clientChans: make(map[string]chan *master_pb.VolumeLocation),
grpcDialOption: grpcDialOption,
- MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Host, 0, peers),
+ MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Host, 0, "", peers),
adminLocks: NewAdminLocks(),
}
ms.bounedLeaderChan = make(chan int, 16)