gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Chris Lu 2020-08-18 17:39:29 -07:00
parent 7e91ae592c
commit c026eb0592
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unmaintained/diff_volume_servers/diff_volume_servers.go
View file

@ -155,7 +155,7 @@ func getVolumeFiles(v uint32, addr string) (map[types.NeedleId]needleState, int6
var maxOffset int64 var maxOffset int64
files := map[types.NeedleId]needleState{} files := map[types.NeedleId]needleState{}
err = idx.WalkIndexFile(idxFile, func(key types.NeedleId, offset types.Offset, size types.Size) error { err = idx.WalkIndexFile(idxFile, func(key types.NeedleId, offset types.Offset, size types.Size) error {
if offset.IsZero() || size < 0 || size == types.TombstoneFileSize { if offset.IsZero() || size.IsDeleted() {
files[key] = needleState{ files[key] = needleState{
state: stateDeleted, state: stateDeleted,
size: size, size: size,

4
weed/server/volume_grpc_erasure_coding.go
View file

@ -272,7 +272,7 @@ func (vs *VolumeServer) VolumeEcShardRead(req *volume_server_pb.VolumeEcShardRea
if req.FileKey != 0 { if req.FileKey != 0 {
_, size, _ := ecVolume.FindNeedleFromEcx(types.Uint64ToNeedleId(req.FileKey)) _, size, _ := ecVolume.FindNeedleFromEcx(types.Uint64ToNeedleId(req.FileKey))
if size == types.TombstoneFileSize { if size.IsDeleted() {
return stream.Send(&volume_server_pb.VolumeEcShardReadResponse{ return stream.Send(&volume_server_pb.VolumeEcShardReadResponse{
IsDeleted: true, IsDeleted: true,
}) })
@ -340,7 +340,7 @@ func (vs *VolumeServer) VolumeEcBlobDelete(ctx context.Context, req *volume_serv
if err != nil { if err != nil {
return nil, fmt.Errorf("locate in local ec volume: %v", err) return nil, fmt.Errorf("locate in local ec volume: %v", err)
} }
if size == types.TombstoneFileSize { if size.IsDeleted() {
return resp, nil return resp, nil
} }

2
weed/storage/erasure_coding/ec_decoder.go
View file

@ -54,7 +54,7 @@ func FindDatFileSize(baseFileName string) (datSize int64, err error) {
err = iterateEcxFile(baseFileName, func(key types.NeedleId, offset types.Offset, size types.Size) error { err = iterateEcxFile(baseFileName, func(key types.NeedleId, offset types.Offset, size types.Size) error {
if size == types.TombstoneFileSize { if size.IsDeleted() {
return nil return nil
} }

2
weed/storage/store_ec.go
View file

@ -124,7 +124,7 @@ func (s *Store) ReadEcShardNeedle(vid needle.VolumeId, n *needle.Needle) (int, e
if err != nil { if err != nil {
return 0, fmt.Errorf("locate in local ec volume: %v", err) return 0, fmt.Errorf("locate in local ec volume: %v", err)
} }
if size == types.TombstoneFileSize { if size.IsDeleted() {
return 0, fmt.Errorf("entry %s is deleted", n.Id) return 0, fmt.Errorf("entry %s is deleted", n.Id)
} }