diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2021-02-18 14:05:51 +0800 |
|---|---|---|
| committer | bingoohuang <bingoo.huang@gmail.com> | 2021-02-18 14:05:51 +0800 |
| commit | 352ac2f2712177d6a9c8220bab73823ff6748581 (patch) | |
| tree | 88b5976b0e9382883ba21a20098c319a8787c002 /weed/server/volume_server.go | |
| parent | eab6e31d34bb22beeb1ca416596c44b1590075c0 (diff) | |
| parent | c8f56f5712c1efffc46de95a8057ed09c21da2db (diff) | |
| download | seaweedfs-352ac2f2712177d6a9c8220bab73823ff6748581.tar.xz seaweedfs-352ac2f2712177d6a9c8220bab73823ff6748581.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'weed/server/volume_server.go')
| -rw-r--r-- | weed/server/volume_server.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index 0443309fb..e496b1ce2 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -2,6 +2,7 @@ package weed_server import ( "fmt" + "github.com/chrislusf/seaweedfs/weed/storage/types" "net/http" "google.golang.org/grpc" @@ -37,7 +38,7 @@ type VolumeServer struct { func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, port int, publicUrl string, - folders []string, maxCounts []int, minFreeSpacePercents []float32, + folders []string, maxCounts []int, minFreeSpacePercents []float32, diskTypes []types.DiskType, idxFolder string, needleMapKind storage.NeedleMapKind, masterNodes []string, pulseSeconds int, @@ -76,7 +77,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, vs.checkWithMaster() - vs.store = storage.NewStore(vs.grpcDialOption, port, ip, publicUrl, folders, maxCounts, minFreeSpacePercents, idxFolder, vs.needleMapKind) + vs.store = storage.NewStore(vs.grpcDialOption, port, ip, publicUrl, folders, maxCounts, minFreeSpacePercents, idxFolder, vs.needleMapKind, diskTypes) vs.guard = security.NewGuard(whiteList, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec) handleStaticResources(adminMux) |