gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not idx file format

Browse Source 
revert c9ab8d05fa
This commit is contained in:
Chris Lu
2020-09-12 12:42:36 -07:00
parent ba984a4e29
commit f2723c1bc8
11 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/command/fix.go
View File

@@ -30,7 +30,6 @@ 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 {
@@ -51,14 +50,9 @@ 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 %s %d bytes with error %v", n.Id.String(), n.Size, pe)
glog.V(2).Infof("saved %d with error %v", n.Size, pe)
} else {
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)
glog.V(2).Infof("skipping deleted file ...")
return scanner.nm.Delete(n.Id)
}
return nil
@@ -89,7 +83,7 @@ func runFix(cmd *Command, args []string) bool {
os.Remove(indexFileName)
}
if err := nm.SaveToIdx(indexFileName, *fixIncludeDeleted); err != nil {
if err := nm.SaveToIdx(indexFileName); err != nil {
glog.Fatalf("save to .idx File: %v", err)
os.Remove(indexFileName)
}