diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-06-21 13:06:04 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-06-21 13:06:04 -0700 |
| commit | 059ef879a8a221bbdb117c4fd69fe092044587b6 (patch) | |
| tree | 8a582d2708d3ba0332e6cf0fe1f5dd6fc1ccdafc | |
| parent | ff97acae62e641c6255b18a3be403202557046b2 (diff) | |
| download | seaweedfs-059ef879a8a221bbdb117c4fd69fe092044587b6.tar.xz seaweedfs-059ef879a8a221bbdb117c4fd69fe092044587b6.zip | |
fix issue 986
fix issue 986
| -rw-r--r-- | weed/filer2/filer_deletion.go | 2 | ||||
| -rw-r--r-- | weed/pb/filer_pb/filer_pb_helper.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/weed/filer2/filer_deletion.go b/weed/filer2/filer_deletion.go index e45f80b2f..06e088de6 100644 --- a/weed/filer2/filer_deletion.go +++ b/weed/filer2/filer_deletion.go @@ -78,7 +78,7 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) { for _, oldChunk := range oldEntry.Chunks { found := false for _, newChunk := range newEntry.Chunks { - if oldChunk.FileId == newChunk.FileId { + if oldChunk.Fid.Equals(newChunk.Fid) { found = true break } diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index 1017e6910..be59089dd 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -21,6 +21,10 @@ func (fid *FileId) toFileId() string { return needle.NewFileId(needle.VolumeId(fid.VolumeId), fid.FileKey, fid.Cookie).String() } +func (fid *FileId) Equals(that *FileId) bool { + return fid.FileKey == that.FileKey && fid.VolumeId == that.VolumeId && fid.Cookie == that.Cookie +} + func BeforeEntrySerialization(chunks []*FileChunk) { for _, chunk := range chunks { |