aboutsummaryrefslogtreecommitdiff
path: root/weed/command/fix.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-09-12 12:42:36 -0700
committerChris Lu <chris.lu@gmail.com>2020-09-12 12:42:36 -0700
commitf2723c1bc83148379dea24ae9c2e3835d089d8eb (patch)
tree39a3464bcb5b96a84236034ca5dcf137157a5257 /weed/command/fix.go
parentba984a4e290c8ba9be56e35befbe5027091ad784 (diff)
downloadseaweedfs-f2723c1bc83148379dea24ae9c2e3835d089d8eb.tar.xz
seaweedfs-f2723c1bc83148379dea24ae9c2e3835d089d8eb.zip
do not idx file format
revert c9ab8d05fa9b425352ce978b5c5b5b0d71d787ad
Diffstat (limited to 'weed/command/fix.go')
-rw-r--r--weed/command/fix.go12
1 files changed, 3 insertions, 9 deletions
diff --git a/weed/command/fix.go b/weed/command/fix.go
index a3435804b..ae9a051b8 100644
--- a/weed/command/fix.go
+++ b/weed/command/fix.go
@@ -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)
}