From e9cd798bd372741753efcba2af594b00fe7b8437 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 13 Dec 2020 00:58:58 -0800 Subject: adding volume type --- weed/operation/assign_file_id.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'weed/operation/assign_file_id.go') diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index 5fe3462e9..5f77d28ca 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -18,6 +18,7 @@ type VolumeAssignRequest struct { Replication string Collection string Ttl string + VolumeType string DataCenter string Rack string DataNode string @@ -54,6 +55,7 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum Replication: request.Replication, Collection: request.Collection, Ttl: request.Ttl, + VolumeType: request.VolumeType, DataCenter: request.DataCenter, Rack: request.Rack, DataNode: request.DataNode, @@ -105,6 +107,7 @@ func LookupJwt(master string, fileId string) security.EncodedJwt { type StorageOption struct { Replication string + VolumeType string Collection string DataCenter string Rack string @@ -123,6 +126,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), + VolumeType: so.VolumeType, DataCenter: so.DataCenter, Rack: so.Rack, WritableVolumeCount: so.VolumeGrowthCount, @@ -133,6 +137,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), + VolumeType: so.VolumeType, DataCenter: "", Rack: "", WritableVolumeCount: so.VolumeGrowthCount, -- cgit v1.2.3 From 0d2ec832e2ced90371f2c5549b175d5b93becd1a Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 13 Dec 2020 11:59:32 -0800 Subject: rename from volumeType to diskType --- weed/operation/assign_file_id.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'weed/operation/assign_file_id.go') diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index 5f77d28ca..bb0b8e6df 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -18,7 +18,7 @@ type VolumeAssignRequest struct { Replication string Collection string Ttl string - VolumeType string + DiskType string DataCenter string Rack string DataNode string @@ -55,7 +55,7 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum Replication: request.Replication, Collection: request.Collection, Ttl: request.Ttl, - VolumeType: request.VolumeType, + DiskType: request.DiskType, DataCenter: request.DataCenter, Rack: request.Rack, DataNode: request.DataNode, @@ -107,7 +107,7 @@ func LookupJwt(master string, fileId string) security.EncodedJwt { type StorageOption struct { Replication string - VolumeType string + DiskType string Collection string DataCenter string Rack string @@ -126,7 +126,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), - VolumeType: so.VolumeType, + DiskType: so.DiskType, DataCenter: so.DataCenter, Rack: so.Rack, WritableVolumeCount: so.VolumeGrowthCount, @@ -137,7 +137,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), - VolumeType: so.VolumeType, + DiskType: so.DiskType, DataCenter: "", Rack: "", WritableVolumeCount: so.VolumeGrowthCount, -- cgit v1.2.3 From 1bf22c0b5b1ecd99cb1631800e5a6818e8d8d1b1 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 16 Dec 2020 09:14:05 -0800 Subject: go fmt --- weed/operation/assign_file_id.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'weed/operation/assign_file_id.go') diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index bb0b8e6df..b2fcf0c96 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -18,7 +18,7 @@ type VolumeAssignRequest struct { Replication string Collection string Ttl string - DiskType string + DiskType string DataCenter string Rack string DataNode string @@ -55,7 +55,7 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum Replication: request.Replication, Collection: request.Collection, Ttl: request.Ttl, - DiskType: request.DiskType, + DiskType: request.DiskType, DataCenter: request.DataCenter, Rack: request.Rack, DataNode: request.DataNode, @@ -107,7 +107,7 @@ func LookupJwt(master string, fileId string) security.EncodedJwt { type StorageOption struct { Replication string - DiskType string + DiskType string Collection string DataCenter string Rack string @@ -126,7 +126,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), - DiskType: so.DiskType, + DiskType: so.DiskType, DataCenter: so.DataCenter, Rack: so.Rack, WritableVolumeCount: so.VolumeGrowthCount, @@ -137,7 +137,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a Replication: so.Replication, Collection: so.Collection, Ttl: so.TtlString(), - DiskType: so.DiskType, + DiskType: so.DiskType, DataCenter: "", Rack: "", WritableVolumeCount: so.VolumeGrowthCount, -- cgit v1.2.3