diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-10-24 06:24:52 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-23 18:24:52 -0700 |
| commit | 6253058d9dbe99c6dd7f2e5af2f34a623548e870 (patch) | |
| tree | 07dea8f7019e0f1cbcaef9f646c8c8782d475f26 /weed/storage/volume_write.go | |
| parent | 7b906966013e723739c5e660d9c0a81a23ccfa37 (diff) | |
| download | seaweedfs-6253058d9dbe99c6dd7f2e5af2f34a623548e870.tar.xz seaweedfs-6253058d9dbe99c6dd7f2e5af2f34a623548e870.zip | |
ensure monotonic n.AppendAtNs in each place (#3880)
https://github.com/seaweedfs/seaweedfs/issues/3852
Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com>
Diffstat (limited to 'weed/storage/volume_write.go')
| -rw-r--r-- | weed/storage/volume_write.go | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/weed/storage/volume_write.go b/weed/storage/volume_write.go index 954b06159..e2537521f 100644 --- a/weed/storage/volume_write.go +++ b/weed/storage/volume_write.go @@ -4,13 +4,11 @@ import ( "bytes" "errors" "fmt" - "os" - "time" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/needle" . "github.com/seaweedfs/seaweedfs/weed/storage/types" + "os" ) var ErrorNotFound = errors.New("not found") @@ -157,7 +155,7 @@ func (v *Volume) doWriteRequest(n *needle.Needle, checkCookie bool) (offset uint } // append to dat file - n.AppendAtNs = max(uint64(time.Now().UnixNano()), v.lastAppendAtNs+1) + n.UpdateAppendAtNs(v.lastAppendAtNs) offset, size, _, err = n.Append(v.DataBackend, v.Version()) v.checkReadWriteError(err) if err != nil { @@ -218,6 +216,7 @@ func (v *Volume) doDeleteRequest(n *needle.Needle) (Size, error) { size := nv.Size if !v.hasRemoteFile { n.Data = nil + n.UpdateAppendAtNs(v.lastAppendAtNs) n.AppendAtNs = uint64(time.Now().UnixNano()) offset, _, _, err = n.Append(v.DataBackend, v.Version()) v.checkReadWriteError(err) @@ -318,7 +317,7 @@ func (v *Volume) WriteNeedleBlob(needleId NeedleId, needleBlob []byte, size Size return fmt.Errorf("volume size limit %d exceeded! current size is %d", MaxPossibleVolumeSize, v.nm.ContentSize()) } - appendAtNs := uint64(time.Now().UnixNano()) + appendAtNs := needle.GetAppendAtNs(v.lastAppendAtNs) offset, err := needle.WriteNeedleBlob(v.DataBackend, needleBlob, size, appendAtNs, v.Version()) v.checkReadWriteError(err) @@ -334,10 +333,3 @@ func (v *Volume) WriteNeedleBlob(needleId NeedleId, needleBlob []byte, size Size return err } - -func max(x, y uint64) uint64 { - if x <= y { - return y - } - return x -} |