diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-08-18 19:22:16 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-08-18 19:22:16 -0700 |
| commit | fe01191b5b93c7f3851e7add9b046c89c8189cdc (patch) | |
| tree | 37a167eac12e540c4a4e26460061fd0b8407bb9b /weed/command | |
| parent | 6ccd7f0a4d8ff5167054147cc66774fec84d80b6 (diff) | |
| download | seaweedfs-fe01191b5b93c7f3851e7add9b046c89c8189cdc.tar.xz seaweedfs-fe01191b5b93c7f3851e7add9b046c89c8189cdc.zip | |
support read option readDeleted=true
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/export.go | 2 | ||||
| -rw-r--r-- | weed/command/fix.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/command/export.go b/weed/command/export.go index 0e2e7ccd9..3ea4b00d3 100644 --- a/weed/command/export.go +++ b/weed/command/export.go @@ -111,7 +111,7 @@ func (scanner *VolumeFileScanner4Export) VisitNeedle(n *needle.Needle, offset in nv, ok := needleMap.Get(n.Id) glog.V(3).Infof("key %d offset %d size %d disk_size %d compressed %v ok %v nv %+v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed(), ok, nv) - if ok && nv.Size > 0 && nv.Size != types.TombstoneFileSize && nv.Offset.ToAcutalOffset() == offset { + if ok && nv.Size.IsValid() && nv.Offset.ToAcutalOffset() == offset { if newerThanUnix >= 0 && n.HasLastModifiedDate() && n.LastModified < uint64(newerThanUnix) { glog.V(3).Infof("Skipping this file, as it's old enough: LastModified %d vs %d", n.LastModified, newerThanUnix) diff --git a/weed/command/fix.go b/weed/command/fix.go index e1455790f..ae9a051b8 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -48,7 +48,7 @@ func (scanner *VolumeFileScanner4Fix) ReadNeedleBody() bool { func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64, needleHeader, needleBody []byte) error { glog.V(2).Infof("key %d offset %d size %d disk_size %d compressed %v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed()) - if n.Size > 0 && n.Size != types.TombstoneFileSize { + if n.Size.IsValid() { pe := scanner.nm.Set(n.Id, types.ToOffset(offset), n.Size) glog.V(2).Infof("saved %d with error %v", n.Size, pe) } else { |