gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Chris Lu
2019-07-17 23:43:48 -07:00
parent 0264a7f50a
commit 898d943b25
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/server/volume_grpc_batch_delete.go
View File

@@ -58,7 +58,7 @@ func (vs *VolumeServer) BatchDelete(ctx context.Context, req *volume_server_pb.B
break break
} }
n.LastModified = now n.LastModified = now
if size, err := vs.store.Delete(volumeId, n); err != nil { if size, err := vs.store.DeleteVolumeNeedle(volumeId, n); err != nil {
resp.Results = append(resp.Results, &volume_server_pb.DeleteResult{ resp.Results = append(resp.Results, &volume_server_pb.DeleteResult{
FileId: fid, FileId: fid,
Status: http.StatusInternalServerError, Status: http.StatusInternalServerError,

2
weed/server/volume_grpc_tail.go
View File

@@ -110,7 +110,7 @@ func (vs *VolumeServer) VolumeTailReceiver(ctx context.Context, req *volume_serv
defer glog.V(1).Infof("receive tailing volume %d finished", v.Id) defer glog.V(1).Infof("receive tailing volume %d finished", v.Id)
return resp, operation.TailVolumeFromSource(req.SourceVolumeServer, vs.grpcDialOption, v.Id, req.SinceNs, int(req.IdleTimeoutSeconds), func(n *needle.Needle) error { return resp, operation.TailVolumeFromSource(req.SourceVolumeServer, vs.grpcDialOption, v.Id, req.SinceNs, int(req.IdleTimeoutSeconds), func(n *needle.Needle) error {
_, _, err := vs.store.Write(v.Id, n) _, _, err := vs.store.WriteVolumeNeedle(v.Id, n)
return err return err
}) })

4
weed/storage/store.go
View File

@@ -211,7 +211,7 @@ func (s *Store) Close() {
} }
} }
func (s *Store) Write(i needle.VolumeId, n *needle.Needle) (size uint32, isUnchanged bool, err error) { func (s *Store) WriteVolumeNeedle(i needle.VolumeId, n *needle.Needle) (size uint32, isUnchanged bool, err error) {
if v := s.findVolume(i); v != nil { if v := s.findVolume(i); v != nil {
if v.readOnly { if v.readOnly {
err = fmt.Errorf("volume %d is read only", i) err = fmt.Errorf("volume %d is read only", i)
@@ -230,7 +230,7 @@ func (s *Store) Write(i needle.VolumeId, n *needle.Needle) (size uint32, isUncha
return return
} }
func (s *Store) Delete(i needle.VolumeId, n *needle.Needle) (uint32, error) { func (s *Store) DeleteVolumeNeedle(i needle.VolumeId, n *needle.Needle) (uint32, error) {
if v := s.findVolume(i); v != nil && !v.readOnly { if v := s.findVolume(i); v != nil && !v.readOnly {
return v.deleteNeedle(n) return v.deleteNeedle(n)
} }

4
weed/topology/store_replicate.go
View File

@@ -25,7 +25,7 @@ func ReplicatedWrite(masterNode string, s *storage.Store,
//check JWT //check JWT
jwt := security.GetJwt(r) jwt := security.GetJwt(r)
size, isUnchanged, err = s.Write(volumeId, n) size, isUnchanged, err = s.WriteVolumeNeedle(volumeId, n)
if err != nil { if err != nil {
err = fmt.Errorf("failed to write to local disk: %v", err) err = fmt.Errorf("failed to write to local disk: %v", err)
return return
@@ -89,7 +89,7 @@ func ReplicatedDelete(masterNode string, store *storage.Store,
//check JWT //check JWT
jwt := security.GetJwt(r) jwt := security.GetJwt(r)
ret, err := store.Delete(volumeId, n) ret, err := store.DeleteVolumeNeedle(volumeId, n)
if err != nil { if err != nil {
glog.V(0).Infoln("delete error:", err) glog.V(0).Infoln("delete error:", err)
return ret, err return ret, err