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

weed backup: efficient delta backup

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/399
This commit is contained in:
Chris Lu
2019-03-25 23:01:53 -07:00
parent c913583e2d
commit df95ce0b6c
6 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/server/volume_grpc_follow.go
View File

@@ -20,14 +20,14 @@ func (vs *VolumeServer) VolumeFollow(req *volume_server_pb.VolumeFollowRequest,
stopOffset := v.Size()
foundOffset, isLastOne, err := v.BinarySearchByAppendAtNs(req.Since)
if err != nil {
return fmt.Errorf("fail to locate by appendAtNs: %s", err)
return fmt.Errorf("fail to locate by appendAtNs %d: %s", req.Since, err)
}
if isLastOne {
return nil
}
startOffset := int64(foundOffset) * int64(types.NeedleEntrySize)
startOffset := int64(foundOffset) * int64(types.NeedlePaddingSize)
buf := make([]byte, 1024*1024*2)
return sendFileContent(v.DataFile(), buf, startOffset, stopOffset, stream)
@@ -40,7 +40,7 @@ func sendFileContent(datFile *os.File, buf []byte, startOffset, stopOffset int64
n, readErr := datFile.ReadAt(buf, startOffset+i)
if readErr == nil || readErr == io.EOF {
resp := &volume_server_pb.VolumeFollowResponse{}
resp.FileContent = buf[i : i+int64(n)]
resp.FileContent = buf[:int64(n)]
sendErr := stream.Send(resp)
if sendErr != nil {
return sendErr