diff options
| author | chrislu <chris.lu@gmail.com> | 2022-04-26 13:03:43 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-04-26 13:03:43 -0700 |
| commit | 94f824e1ce4bc9400d8f3ede1a5420f65ba6b5aa (patch) | |
| tree | 090be215cd6930b9c0db1557939376db2964d0ef | |
| parent | 3bce568c32f78a5bf12f0a31995d4098ca97fc6b (diff) | |
| download | seaweedfs-94f824e1ce4bc9400d8f3ede1a5420f65ba6b5aa.tar.xz seaweedfs-94f824e1ce4bc9400d8f3ede1a5420f65ba6b5aa.zip | |
volume: sync to disk before copying volume files
address https://github.com/chrislusf/seaweedfs/issues/2976
| -rw-r--r-- | weed/server/volume_grpc_copy.go | 1 | ||||
| -rw-r--r-- | weed/storage/volume.go | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go index 6ed2724f1..e3ec5b724 100644 --- a/weed/server/volume_grpc_copy.go +++ b/weed/server/volume_grpc_copy.go @@ -279,6 +279,7 @@ func (vs *VolumeServer) CopyFile(req *volume_server_pb.CopyFileRequest, stream v if uint32(v.CompactionRevision) != req.CompactionRevision && req.CompactionRevision != math.MaxUint32 { return fmt.Errorf("volume %d is compacted", req.VolumeId) } + v.SyncToDisk() fileName = v.FileName(req.Ext) } else { baseFileName := erasure_coding.EcShardBaseFileName(req.Collection, int(req.VolumeId)) + req.Ext diff --git a/weed/storage/volume.go b/weed/storage/volume.go index 6d48fbc83..f388c7d99 100644 --- a/weed/storage/volume.go +++ b/weed/storage/volume.go @@ -190,6 +190,21 @@ func (v *Volume) SetStopping() { } } +func (v *Volume) SyncToDisk() { + v.dataFileAccessLock.Lock() + defer v.dataFileAccessLock.Unlock() + if v.nm != nil { + if err := v.nm.Sync(); err != nil { + glog.Warningf("Volume Close fail to sync volume idx %d", v.Id) + } + } + if v.DataBackend != nil { + if err := v.DataBackend.Sync(); err != nil { + glog.Warningf("Volume Close fail to sync volume %d", v.Id) + } + } +} + // Close cleanly shuts down this volume func (v *Volume) Close() { v.dataFileAccessLock.Lock() |
