diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-05-27 21:22:23 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-05-27 21:22:23 -0700 |
| commit | 03b9291e5da8a25a9c8a968de752e331da60ef7c (patch) | |
| tree | 05f0bb4ee056af577a8d6eada2cee4cf72b2a6cc /weed/server/volume_server.go | |
| parent | ac1ba3b667f7fff9a07fe18d7ef077f111ab4cdc (diff) | |
| download | seaweedfs-03b9291e5da8a25a9c8a968de752e331da60ef7c.tar.xz seaweedfs-03b9291e5da8a25a9c8a968de752e331da60ef7c.zip | |
volum server passes grpc option and master location to store
Diffstat (limited to 'weed/server/volume_server.go')
| -rw-r--r-- | weed/server/volume_server.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index ff9f6c21f..fab2edac0 100644 --- a/weed/server/volume_server.go +++ b/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) |