diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-09-10 02:39:41 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-09-10 02:39:41 -0700 |
| commit | 267201ff44d58d339ad2c9006ffe1d6d65e569b3 (patch) | |
| tree | cdd69e7d3b4f10d9e1898db6231fc50b247ebef2 | |
| parent | 109385e95598d228767b8721490cb09e0bcde075 (diff) | |
| download | seaweedfs-267201ff44d58d339ad2c9006ffe1d6d65e569b3.tar.xz seaweedfs-267201ff44d58d339ad2c9006ffe1d6d65e569b3.zip | |
handle non continuous writes
fix #728
| -rw-r--r-- | weed/filesys/dirty_page.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go index 1dd7d3fde..145d89138 100644 --- a/weed/filesys/dirty_page.go +++ b/weed/filesys/dirty_page.go @@ -66,10 +66,18 @@ func (pages *ContinuousDirtyPages) AddPage(ctx context.Context, offset int64, da if offset != pages.Offset+pages.Size { // when this happens, debug shows the data overlapping with existing data is empty // the data is not just append - return pages.flushAndSave(ctx, offset, data) + if offset == pages.Offset { + copy(pages.Data[pages.Size:], data[pages.Size:]) + } else { + if pages.Size != 0 { + glog.V(0).Infof("possible error: pages [%d, %d) write [%d, %d)", pages.Offset, pages.Offset+pages.Size, offset, offset+int64(len(data))) + } + return pages.flushAndSave(ctx, offset, data) + } + } else { + copy(pages.Data[offset-pages.Offset:], data) } - copy(pages.Data[offset-pages.Offset:], data) pages.Size = max(pages.Size, offset+int64(len(data))-pages.Offset) return |