Merge pull request #4 from chrislusf/master

Syncing  to the original repository

1 files changed, 41 insertions, 39 deletions

diff --git a/weed/command/master.go b/weed/command/master.go
index 9e9308468..8d0a3289c 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -12,6 +12,7 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/server"
+	"github.com/chrislusf/seaweedfs/weed/storage/backend"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
 	"github.com/spf13/viper"
@@ -72,8 +73,6 @@ var cmdMaster = &Command{
 var (
 	masterCpuProfile = cmdMaster.Flag.String("cpuprofile", "", "cpu profile output file")
 	masterMemProfile = cmdMaster.Flag.String("memprofile", "", "memory profile output file")
-
-	masterWhiteList []string
 )
 
 func runMaster(cmd *Command, args []string) bool {
@@ -87,6 +86,8 @@ func runMaster(cmd *Command, args []string) bool {
 	if err := util.TestFolderWritable(*m.metaFolder); err != nil {
 		glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *m.metaFolder, err)
 	}
+
+	var masterWhiteList []string
 	if *m.whiteList != "" {
 		masterWhiteList = strings.Split(*m.whiteList, ",")
 	}
@@ -94,52 +95,54 @@ func runMaster(cmd *Command, args []string) bool {
 		glog.Fatalf("volumeSizeLimitMB should be smaller than 30000")
 	}
 
-	r := mux.NewRouter()
-	ms := weed_server.NewMasterServer(r, m.toMasterOption(masterWhiteList))
+	startMaster(m, masterWhiteList)
+
+	return true
+}
 
-	listeningAddress := *m.ipBind + ":" + strconv.Itoa(*m.port)
+func startMaster(masterOption MasterOptions, masterWhiteList []string) {
 
-	glog.V(0).Infoln("Start Seaweed Master", util.VERSION, "at", listeningAddress)
+	backend.LoadConfiguration(viper.GetViper())
 
+	myMasterAddress, peers := checkPeers(*masterOption.ip, *masterOption.port, *masterOption.peers)
+
+	r := mux.NewRouter()
+	ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), peers)
+	listeningAddress := *masterOption.ipBind + ":" + strconv.Itoa(*masterOption.port)
+	glog.V(0).Infof("Start Seaweed Master %s at %s", util.VERSION, listeningAddress)
 	masterListener, e := util.NewListener(listeningAddress, 0)
 	if e != nil {
 		glog.Fatalf("Master startup error: %v", e)
 	}
+	// start raftServer
+	raftServer := weed_server.NewRaftServer(security.LoadClientTLS(viper.Sub("grpc"), "master"),
+		peers, myMasterAddress, *masterOption.metaFolder, ms.Topo, *masterOption.pulseSeconds)
+	if raftServer == nil {
+		glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717", *masterOption.metaFolder)
+	}
+	ms.SetRaftServer(raftServer)
+	r.HandleFunc("/cluster/status", raftServer.StatusHandler).Methods("GET")
+	// starting grpc server
+	grpcPort := *masterOption.port + 10000
+	grpcL, err := util.NewListener(*masterOption.ipBind+":"+strconv.Itoa(grpcPort), 0)
+	if err != nil {
+		glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err)
+	}
+	// Create your protocol servers.
+	grpcS := util.NewGrpcServer(security.LoadServerTLS(viper.Sub("grpc"), "master"))
+	master_pb.RegisterSeaweedServer(grpcS, ms)
+	protobuf.RegisterRaftServer(grpcS, raftServer)
+	reflection.Register(grpcS)
+	glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.VERSION, *masterOption.ipBind, grpcPort)
+	go grpcS.Serve(grpcL)
 
-	go func() {
-		// start raftServer
-		myMasterAddress, peers := checkPeers(*m.ip, *m.port, *m.peers)
-		raftServer := weed_server.NewRaftServer(security.LoadClientTLS(viper.Sub("grpc"), "master"),
-			peers, myMasterAddress, *m.metaFolder, ms.Topo, *m.pulseSeconds)
-		if raftServer == nil {
-			glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717", *m.metaFolder)
-		}
-		ms.SetRaftServer(raftServer)
-		r.HandleFunc("/cluster/status", raftServer.StatusHandler).Methods("GET")
-
-		// starting grpc server
-		grpcPort := *m.port + 10000
-		grpcL, err := util.NewListener(*m.ipBind+":"+strconv.Itoa(grpcPort), 0)
-		if err != nil {
-			glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err)
-		}
-		// Create your protocol servers.
-		grpcS := util.NewGrpcServer(security.LoadServerTLS(viper.Sub("grpc"), "master"))
-		master_pb.RegisterSeaweedServer(grpcS, ms)
-		protobuf.RegisterRaftServer(grpcS, raftServer)
-		reflection.Register(grpcS)
-
-		glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.VERSION, *m.ipBind, grpcPort)
-		grpcS.Serve(grpcL)
-	}()
+	go ms.MasterClient.KeepConnectedToMaster()
 
 	// start http server
 	httpS := &http.Server{Handler: r}
-	if err := httpS.Serve(masterListener); err != nil {
-		glog.Fatalf("master server failed to serve: %v", err)
-	}
+	go httpS.Serve(masterListener)
 
-	return true
+	select {}
 }
 
 func checkPeers(masterIp string, masterPort int, peers string) (masterAddress string, cleanedPeers []string) {
@@ -156,11 +159,10 @@ func checkPeers(masterIp string, masterPort int, peers string) (masterAddress st
 		}
 	}
 
-	peerCount := len(cleanedPeers)
 	if !hasSelf {
-		peerCount += 1
+		cleanedPeers = append(cleanedPeers, masterAddress)
 	}
-	if peerCount%2 == 0 {
+	if len(cleanedPeers)%2 == 0 {
 		glog.Fatalf("Only odd number of masters are supported!")
 	}
 	return