diff options
| -rw-r--r-- | weed/cluster/cluster.go (renamed from weed/election/cluster.go) | 2 | ||||
| -rw-r--r-- | weed/cluster/cluster_test.go (renamed from weed/election/cluster_test.go) | 2 | ||||
| -rw-r--r-- | weed/server/master_server.go | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/weed/election/cluster.go b/weed/cluster/cluster.go index cf77771ba..11187169e 100644 --- a/weed/election/cluster.go +++ b/weed/cluster/cluster.go @@ -1,4 +1,4 @@ -package election +package cluster import ( "github.com/chrislusf/seaweedfs/weed/pb" diff --git a/weed/election/cluster_test.go b/weed/cluster/cluster_test.go index 624ff27d6..dd68d59b9 100644 --- a/weed/election/cluster_test.go +++ b/weed/cluster/cluster_test.go @@ -1,4 +1,4 @@ -package election +package cluster import ( "github.com/chrislusf/seaweedfs/weed/pb" diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 39812f641..a73e8384e 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -2,7 +2,7 @@ package weed_server import ( "fmt" - "github.com/chrislusf/seaweedfs/weed/election" + "github.com/chrislusf/seaweedfs/weed/cluster" "github.com/chrislusf/seaweedfs/weed/pb" "net/http" "net/http/httputil" @@ -69,7 +69,7 @@ type MasterServer struct { adminLocks *AdminLocks - Cluster *election.Cluster + Cluster *cluster.Cluster } func NewMasterServer(r *mux.Router, option *MasterOption, peers []pb.ServerAddress) *MasterServer { @@ -106,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: election.NewCluster(), + Cluster: cluster.NewCluster(), } ms.boundedLeaderChan = make(chan int, 16) |