aboutsummaryrefslogtreecommitdiff
path: root/weed/server/master_server.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/server/master_server.go')
-rw-r--r--weed/server/master_server.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index 3f1f1c082..af2f7ddd5 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -2,6 +2,7 @@ package weed_server
import (
"fmt"
+ "github.com/chrislusf/seaweedfs/weed/election"
"github.com/chrislusf/seaweedfs/weed/pb"
"net/http"
"net/http/httputil"
@@ -68,7 +69,7 @@ type MasterServer struct {
adminLocks *AdminLocks
- Cluster *Cluster
+ Cluster *election.Cluster
}
func NewMasterServer(r *mux.Router, option *MasterOption, peers []pb.ServerAddress) *MasterServer {
@@ -105,7 +106,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []pb.ServerAddre
grpcDialOption: grpcDialOption,
MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Master, "", peers),
adminLocks: NewAdminLocks(),
- Cluster: NewCluster(),
+ Cluster: election.NewCluster(),
}
ms.boundedLeaderChan = make(chan int, 16)