Refactor out weedfs vacuum.

go/storage/store.go

@@ -164,41 +164,6 @@ func (s *Store) addVolume(vid VolumeId, collection string, replicaPlacement *Rep
 	return fmt.Errorf("No more free space left")
 }
 
-func (s *Store) CheckCompactVolume(volumeIdString string, garbageThresholdString string) (error, bool) {
-	vid, err := NewVolumeId(volumeIdString)
-	if err != nil {
-		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString), false
-	}
-	garbageThreshold, e := strconv.ParseFloat(garbageThresholdString, 32)
-	if e != nil {
-		return fmt.Errorf("garbageThreshold %s is not a valid float number!", garbageThresholdString), false
-	}
-	if v := s.findVolume(vid); v != nil {
-		glog.V(3).Infoln(vid, "garbage level is", v.garbageLevel())
-		return nil, garbageThreshold < v.garbageLevel()
-	}
-	return fmt.Errorf("volume id %d is not found during check compact!", vid), false
-}
-func (s *Store) CompactVolume(volumeIdString string) error {
-	vid, err := NewVolumeId(volumeIdString)
-	if err != nil {
-		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString)
-	}
-	if v := s.findVolume(vid); v != nil {
-		return v.Compact()
-	}
-	return fmt.Errorf("volume id %d is not found during compact!", vid)
-}
-func (s *Store) CommitCompactVolume(volumeIdString string) error {
-	vid, err := NewVolumeId(volumeIdString)
-	if err != nil {
-		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString)
-	}
-	if v := s.findVolume(vid); v != nil {
-		return v.commitCompact()
-	}
-	return fmt.Errorf("volume id %d is not found during commit compact!", vid)
-}
 func (s *Store) FreezeVolume(volumeIdString string) error {
 	vid, err := NewVolumeId(volumeIdString)
 	if err != nil {

go/storage/store_vacuum.go

@@ -0,0 +1,43 @@
+package storage
+
+import (
+	"code.google.com/p/weed-fs/go/glog"
+	"fmt"
+	"strconv"
+)
+
+func (s *Store) CheckCompactVolume(volumeIdString string, garbageThresholdString string) (error, bool) {
+	vid, err := NewVolumeId(volumeIdString)
+	if err != nil {
+		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString), false
+	}
+	garbageThreshold, e := strconv.ParseFloat(garbageThresholdString, 32)
+	if e != nil {
+		return fmt.Errorf("garbageThreshold %s is not a valid float number!", garbageThresholdString), false
+	}
+	if v := s.findVolume(vid); v != nil {
+		glog.V(3).Infoln(vid, "garbage level is", v.garbageLevel())
+		return nil, garbageThreshold < v.garbageLevel()
+	}
+	return fmt.Errorf("volume id %d is not found during check compact!", vid), false
+}
+func (s *Store) CompactVolume(volumeIdString string) error {
+	vid, err := NewVolumeId(volumeIdString)
+	if err != nil {
+		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString)
+	}
+	if v := s.findVolume(vid); v != nil {
+		return v.Compact()
+	}
+	return fmt.Errorf("volume id %d is not found during compact!", vid)
+}
+func (s *Store) CommitCompactVolume(volumeIdString string) error {
+	vid, err := NewVolumeId(volumeIdString)
+	if err != nil {
+		return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", volumeIdString)
+	}
+	if v := s.findVolume(vid); v != nil {
+		return v.commitCompact()
+	}
+	return fmt.Errorf("volume id %d is not found during commit compact!", vid)
+}