diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2020-05-27 13:33:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 13:33:00 +0800 |
| commit | 73264b952b51c5fd57e84f7e73b8667e5b09b95e (patch) | |
| tree | 48395cc0e17454bd2bcd0e89a80224dde8c7aeff /weed/server/master_server.go | |
| parent | ecdeef8c66eadbf9b4e8ac7f221444d1d92a9de0 (diff) | |
| parent | ef2b3a0801ba1a56f97460a591957942c194942d (diff) | |
| download | seaweedfs-73264b952b51c5fd57e84f7e73b8667e5b09b95e.tar.xz seaweedfs-73264b952b51c5fd57e84f7e73b8667e5b09b95e.zip | |
Merge pull request #1 from chrislusf/master
Diffstat (limited to 'weed/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 53ac7b2e2..dc3ef9cfc 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -66,8 +66,7 @@ type MasterServer struct { MasterClient *wdclient.MasterClient - adminAccessSecret int64 - adminAccessLockTime time.Time + adminLocks *AdminLocks } func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *MasterServer { @@ -96,6 +95,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste clientChans: make(map[string]chan *master_pb.VolumeLocation), grpcDialOption: grpcDialOption, MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Host, 0, peers), + adminLocks: NewAdminLocks(), } ms.bounedLeaderChan = make(chan int, 16) |