diff options
| -rw-r--r-- | go/storage/store.go | 2 | ||||
| -rw-r--r-- | go/storage/volume.go | 2 | ||||
| -rw-r--r-- | go/weed/compact.go | 44 | ||||
| -rw-r--r-- | go/weed/weed.go | 1 |
4 files changed, 47 insertions, 2 deletions
diff --git a/go/storage/store.go b/go/storage/store.go index bea3bd34f..e5dc92bf6 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -126,7 +126,7 @@ func (s *Store) CompactVolume(volumeIdString string) error { return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString) } if v := s.findVolume(vid); v != nil { - return v.compact() + return v.Compact() } return fmt.Errorf("volume id %s is not found during compact!", vid) } diff --git a/go/storage/volume.go b/go/storage/volume.go index 2466113c5..7eb3ea7e6 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -256,7 +256,7 @@ func (v *Volume) garbageLevel() float64 { return float64(v.nm.DeletedSize()) / float64(v.ContentSize()) } -func (v *Volume) compact() error { +func (v *Volume) Compact() error { v.accessLock.Lock() defer v.accessLock.Unlock() diff --git a/go/weed/compact.go b/go/weed/compact.go new file mode 100644 index 000000000..30ae6abd2 --- /dev/null +++ b/go/weed/compact.go @@ -0,0 +1,44 @@ +package main + +import ( + "code.google.com/p/weed-fs/go/glog" + "code.google.com/p/weed-fs/go/storage" +) + +func init() { + cmdCompact.Run = runCompact // break init cycle + cmdCompact.IsDebug = cmdCompact.Flag.Bool("debug", false, "enable debug mode") +} + +var cmdCompact = &Command{ + UsageLine: "compact -dir=/tmp -volumeId=234", + Short: "run weed tool compact on volume file if corrupted", + Long: `Force an compaction to remove deleted files from volume files. + The compacted .dat file is stored as .cpd file. + The compacted .idx file is stored as .cpx file. + + `, +} + +var ( + compactVolumePath = cmdCompact.Flag.String("dir", "/tmp", "data directory to store files") + compactVolumeId = cmdCompact.Flag.Int("volumeId", -1, "a volume id. The volume should already exist in the dir.") +) + +func runCompact(cmd *Command, args []string) bool { + + if *compactVolumeId == -1 { + return false + } + + vid := storage.VolumeId(*compactVolumeId) + v, err := storage.NewVolume(*compactVolumePath, vid, storage.CopyNil) + if err != nil { + glog.Fatalf("Load Volume [ERROR] %s\n", err) + } + if err = v.Compact(); err != nil { + glog.Fatalf("Compact Volume [ERROR] %s\n", err) + } + + return true +} diff --git a/go/weed/weed.go b/go/weed/weed.go index e9bc4e37d..0b1512636 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -22,6 +22,7 @@ var IsDebug *bool var server *string var commands = []*Command{ + cmdCompact, cmdFix, cmdMaster, cmdUpload, |