diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-10-29 23:18:41 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-10-29 23:18:41 -0700 |
| commit | 5b950c735e3076afabe09ec6d36ca6919e674300 (patch) | |
| tree | 30f502b54fe1566370b93524df765f080420de20 /weed/server/master_server.go | |
| parent | b7156291a85f9582ddb97ea357c38ee141e09f73 (diff) | |
| parent | 57e441d67be69311b2428d88dd41b5791ee51f99 (diff) | |
| download | seaweedfs-5b950c735e3076afabe09ec6d36ca6919e674300.tar.xz seaweedfs-5b950c735e3076afabe09ec6d36ca6919e674300.zip | |
Merge branch 'master' into refactoring_dat_backend
Diffstat (limited to 'weed/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index e9eb32cca..cde583560 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -3,9 +3,6 @@ package weed_server import ( "context" "fmt" - "github.com/chrislusf/seaweedfs/weed/shell" - "github.com/chrislusf/seaweedfs/weed/wdclient" - "google.golang.org/grpc" "net/http" "net/http/httputil" "net/url" @@ -21,10 +18,13 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/sequence" + "github.com/chrislusf/seaweedfs/weed/shell" "github.com/chrislusf/seaweedfs/weed/topology" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/wdclient" "github.com/gorilla/mux" "github.com/spf13/viper" + "google.golang.org/grpc" ) type MasterOption struct { @@ -57,7 +57,7 @@ type MasterServer struct { clientChansLock sync.RWMutex clientChans map[string]chan *master_pb.VolumeLocation - grpcDialOpiton grpc.DialOption + grpcDialOption grpc.DialOption MasterClient *wdclient.MasterClient } @@ -83,7 +83,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste option: option, preallocateSize: preallocateSize, clientChans: make(map[string]chan *master_pb.VolumeLocation), - grpcDialOpiton: grpcDialOption, + grpcDialOption: grpcDialOption, MasterClient: wdclient.NewMasterClient(context.Background(), grpcDialOption, "master", peers), } ms.bounedLeaderChan = make(chan int, 16) @@ -112,7 +112,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste r.HandleFunc("/{fileId}", ms.redirectHandler) } - ms.Topo.StartRefreshWritableVolumes(ms.grpcDialOpiton, ms.option.GarbageThreshold, ms.preallocateSize) + ms.Topo.StartRefreshWritableVolumes(ms.grpcDialOption, ms.option.GarbageThreshold, ms.preallocateSize) ms.startAdminScripts() |