diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2019-10-21 22:30:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 22:30:35 -0700 |
| commit | c262526d8ad86b54bd34bacddd6cc393ebfbe984 (patch) | |
| tree | 512a3e6178b0f7d7f18d3169e8ff6425982776ba /weed/topology | |
| parent | 7de121d99b87d4d38356fb83ee15e761f7d22ed4 (diff) | |
| parent | 2e2fe00dbd69d631bff8189708315ebea5f1e524 (diff) | |
| download | seaweedfs-c262526d8ad86b54bd34bacddd6cc393ebfbe984.tar.xz seaweedfs-c262526d8ad86b54bd34bacddd6cc393ebfbe984.zip | |
Merge pull request #1087 from joeslay/master
Storing files in in-memory collections on windows
Diffstat (limited to 'weed/topology')
| -rw-r--r-- | weed/topology/allocate_volume.go | 11 | ||||
| -rw-r--r-- | weed/topology/volume_growth.go | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/weed/topology/allocate_volume.go b/weed/topology/allocate_volume.go index 48336092f..342ca6579 100644 --- a/weed/topology/allocate_volume.go +++ b/weed/topology/allocate_volume.go @@ -18,11 +18,12 @@ func AllocateVolume(dn *DataNode, grpcDialOption grpc.DialOption, vid needle.Vol return operation.WithVolumeServerClient(dn.Url(), grpcDialOption, func(client volume_server_pb.VolumeServerClient) error { _, deleteErr := client.AllocateVolume(context.Background(), &volume_server_pb.AllocateVolumeRequest{ - VolumeId: uint32(vid), - Collection: option.Collection, - Replication: option.ReplicaPlacement.String(), - Ttl: option.Ttl.String(), - Preallocate: option.Prealloacte, + VolumeId: uint32(vid), + Collection: option.Collection, + Replication: option.ReplicaPlacement.String(), + Ttl: option.Ttl.String(), + Preallocate: option.Prealloacte, + MemoryMapMaxSizeMB: option.MemoryMapMaxSizeMB, }) return deleteErr }) diff --git a/weed/topology/volume_growth.go b/weed/topology/volume_growth.go index ff02044a1..14f94fbd2 100644 --- a/weed/topology/volume_growth.go +++ b/weed/topology/volume_growth.go @@ -21,13 +21,14 @@ This package is created to resolve these replica placement issues: */ type VolumeGrowOption struct { - Collection string - ReplicaPlacement *storage.ReplicaPlacement - Ttl *needle.TTL - Prealloacte int64 - DataCenter string - Rack string - DataNode string + Collection string + ReplicaPlacement *storage.ReplicaPlacement + Ttl *needle.TTL + Prealloacte int64 + DataCenter string + Rack string + DataNode string + MemoryMapMaxSizeMB uint32 } type VolumeGrowth struct { |