diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/export.go | 2 | ||||
| -rw-r--r-- | weed/command/fix.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/weed/command/export.go b/weed/command/export.go index 529ee47e3..1202d687c 100644 --- a/weed/command/export.go +++ b/weed/command/export.go @@ -161,7 +161,7 @@ func runExport(cmd *Command, args []string) bool { }, true, func(n *storage.Needle, offset int64) error { nv, ok := needleMap.Get(n.Id) glog.V(3).Infof("key %d offset %d size %d disk_size %d gzip %v ok %v nv %+v", - n.Id, offset, n.Size, n.DiskSize(), n.IsGzipped(), ok, nv) + n.Id, offset, n.Size, n.DiskSize(version), n.IsGzipped(), ok, nv) if ok && nv.Size > 0 && int64(nv.Offset)*types.NeedlePaddingSize == 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", diff --git a/weed/command/fix.go b/weed/command/fix.go index 32b09fd72..916338d3e 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -47,13 +47,15 @@ func runFix(cmd *Command, args []string) bool { nm := storage.NewBtreeNeedleMap(indexFile) defer nm.Close() + var version storage.Version vid := storage.VolumeId(*fixVolumeId) err = storage.ScanVolumeFile(*fixVolumePath, *fixVolumeCollection, vid, storage.NeedleMapInMemory, func(superBlock storage.SuperBlock) error { + version = superBlock.Version() return nil }, false, func(n *storage.Needle, offset int64) error { - glog.V(2).Infof("key %d offset %d size %d disk_size %d gzip %v", n.Id, offset, n.Size, n.DiskSize(), n.IsGzipped()) + glog.V(2).Infof("key %d offset %d size %d disk_size %d gzip %v", n.Id, offset, n.Size, n.DiskSize(version), n.IsGzipped()) if n.Size > 0 { pe := nm.Put(n.Id, types.Offset(offset/types.NeedlePaddingSize), n.Size) glog.V(2).Infof("saved %d with error %v", n.Size, pe) |