diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/fix.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/weed/command/fix.go b/weed/command/fix.go index ae9a051b8..a3435804b 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -30,6 +30,7 @@ var ( fixVolumePath = cmdFix.Flag.String("dir", ".", "data directory to store files") fixVolumeCollection = cmdFix.Flag.String("collection", "", "the volume collection name") fixVolumeId = cmdFix.Flag.Int("volumeId", -1, "a volume id. The volume should already exist in the dir. The volume index file should not exist.") + fixIncludeDeleted = cmdFix.Flag.Bool("includeDeleted", false, "include deleted entries in the index file") ) type VolumeFileScanner4Fix struct { @@ -50,9 +51,14 @@ func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64 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.IsValid() { pe := scanner.nm.Set(n.Id, types.ToOffset(offset), n.Size) - glog.V(2).Infof("saved %d with error %v", n.Size, pe) + glog.V(2).Infof("saved %s %d bytes with error %v", n.Id.String(), n.Size, pe) } else { - glog.V(2).Infof("skipping deleted file ...") + if val, found := scanner.nm.Get(n.Id); *fixIncludeDeleted && found && val.Size > 0 { + pe := scanner.nm.Set(n.Id, val.Offset, -val.Size) + glog.V(2).Infof("update deleted %s %d bytes with error %v", n.Id.String(), -val.Size, pe) + return nil + } + glog.V(1).Infof("skipping deleted file %s size %d ...", n.Id.String(), n.Size) return scanner.nm.Delete(n.Id) } return nil @@ -83,7 +89,7 @@ func runFix(cmd *Command, args []string) bool { os.Remove(indexFileName) } - if err := nm.SaveToIdx(indexFileName); err != nil { + if err := nm.SaveToIdx(indexFileName, *fixIncludeDeleted); err != nil { glog.Fatalf("save to .idx File: %v", err) os.Remove(indexFileName) } |