volum server passes grpc option and master location to store

weed/server/volume_grpc_client_to_master.go

@@ -21,7 +21,7 @@ func (vs *VolumeServer) GetMaster() string {
 }
 func (vs *VolumeServer) heartbeat() {
 
-	glog.V(0).Infof("Volume server start with masters: %v", vs.MasterNodes)
+	glog.V(0).Infof("Volume server start with seed master nodes: %v", vs.SeedMasterNodes)
 	vs.store.SetDataCenter(vs.dataCenter)
 	vs.store.SetRack(vs.rack)
 
@@ -30,7 +30,7 @@ func (vs *VolumeServer) heartbeat() {
 	var err error
 	var newLeader string
 	for {
-		for _, master := range vs.MasterNodes {
+		for _, master := range vs.SeedMasterNodes {
 			if newLeader != "" {
 				master = newLeader
 			}
@@ -39,11 +39,13 @@ func (vs *VolumeServer) heartbeat() {
 				glog.V(0).Infof("failed to parse master grpc %v: %v", masterGrpcAddress, parseErr)
 				continue
 			}
+			vs.store.MasterGrpcAddress = masterGrpcAddress
 			newLeader, err = vs.doHeartbeat(context.Background(), master, masterGrpcAddress, grpcDialOption, time.Duration(vs.pulseSeconds)*time.Second)
 			if err != nil {
 				glog.V(0).Infof("heartbeat error: %v", err)
 				time.Sleep(time.Duration(vs.pulseSeconds) * time.Second)
 				newLeader = ""
+				vs.store.MasterGrpcAddress = ""
 			}
 		}
 	}

weed/server/volume_server.go

@@ -11,14 +11,14 @@ import (
 )
 
 type VolumeServer struct {
-	MasterNodes    []string
-	currentMaster  string
-	pulseSeconds   int
-	dataCenter     string
-	rack           string
-	store          *storage.Store
-	guard          *security.Guard
-	grpcDialOption grpc.DialOption
+	SeedMasterNodes []string
+	currentMaster   string
+	pulseSeconds    int
+	dataCenter      string
+	rack            string
+	store           *storage.Store
+	guard           *security.Guard
+	grpcDialOption  grpc.DialOption
 
 	needleMapKind           storage.NeedleMapType
 	FixJpgOrientation       bool
@@ -54,8 +54,8 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 		grpcDialOption:          security.LoadClientTLS(viper.Sub("grpc"), "volume"),
 		compactionBytePerSecond: int64(compactionMBPerSecond) * 1024 * 1024,
 	}
-	vs.MasterNodes = masterNodes
-	vs.store = storage.NewStore(port, ip, publicUrl, folders, maxCounts, vs.needleMapKind)
+	vs.SeedMasterNodes = masterNodes
+	vs.store = storage.NewStore(vs.grpcDialOption, port, ip, publicUrl, folders, maxCounts, vs.needleMapKind)
 
 	vs.guard = security.NewGuard(whiteList, signingKey, expiresAfterSec)
 

weed/server/volume_server_handlers_read.go

@@ -2,6 +2,7 @@ package weed_server
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"mime"
 	"mime/multipart"
@@ -71,7 +72,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
 	if hasVolume {
 		count, err = vs.store.ReadVolumeNeedle(volumeId, n)
 	} else if hasEcShard {
-		count, err = vs.store.ReadEcShardNeedle(volumeId, n)
+		count, err = vs.store.ReadEcShardNeedle(context.Background(), volumeId, n)
 	}
 	glog.V(4).Infoln("read bytes", count, "error", err)
 	if err != nil || count < 0 {

weed/server/volume_server_handlers_ui.go

@@ -29,7 +29,7 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request)
 		Counters     *stats.ServerStats
 	}{
 		util.VERSION,
-		vs.MasterNodes,
+		vs.SeedMasterNodes,
 		vs.store.Status(),
 		ds,
 		infos,