if trashLifetime == 0 {
return os.Remove(p)
}
- return os.Rename(p, fmt.Sprintf("%v.trash.%d", p, time.Now().Unix()+int64(trashLifetime)))
+ return os.Rename(p, fmt.Sprintf("%v.trash.%d", p, time.Now().Add(trashLifetime).Unix()))
}
// Untrash moves block from trash back into store
return MethodDisabledError
}
+ files, err := ioutil.ReadDir(v.blockDir(loc))
+ if err != nil {
+ return err
+ }
+
+ if len(files) == 0 {
+ return os.ErrNotExist
+ }
+
+ foundTrash := false
prefix := fmt.Sprintf("%v.trash.", loc)
- files, _ := ioutil.ReadDir(v.blockDir(loc))
for _, f := range files {
if strings.HasPrefix(f.Name(), prefix) {
+ foundTrash = true
err = os.Rename(v.blockPath(f.Name()), v.blockPath(loc))
- if err != nil {
+ if err == nil {
break
}
}
}
+ if foundTrash == false {
+ return os.ErrNotExist
+ }
+
return
}
}
}
-var trashRegexp = regexp.MustCompile(`.*([0-9a-fA-F]{32}).trash.(\d+)`)
+var trashLocRegexp = regexp.MustCompile(`/([0-9a-f]{32})\.trash\.(\d+)$`)
// EmptyTrash walks hierarchy looking for {hash}.trash.*
// and deletes those with deadline < now.
-func (v *UnixVolume) EmptyTrash() error {
+func (v *UnixVolume) EmptyTrash() {
var bytesDeleted, bytesInTrash int64
var blocksDeleted, blocksInTrash int
err := filepath.Walk(v.root, func(path string, info os.FileInfo, err error) error {
if err != nil {
- log.Printf("EmptyTrash error for %v: %v", path, err)
- } else if !info.Mode().IsDir() {
- matches := trashRegexp.FindStringSubmatch(path)
- if len(matches) == 3 {
- deadline, err := strconv.Atoi(matches[2])
- if err != nil {
- log.Printf("EmptyTrash error for %v: %v", matches[1], err)
- } else {
- if int64(deadline) < time.Now().Unix() {
- err = os.Remove(path)
- if err != nil {
- log.Printf("Error deleting %v: %v", matches[1], err)
- bytesInTrash += info.Size()
- blocksInTrash++
- } else {
- bytesDeleted += info.Size()
- blocksDeleted++
- }
- } else {
- bytesInTrash += info.Size()
- blocksInTrash++
- }
- }
- }
+ log.Printf("EmptyTrash: filepath.Walk: %v: %v", path, err)
+ return nil
+ }
+ if info.Mode().IsDir() {
+ return nil
+ }
+ matches := trashLocRegexp.FindStringSubmatch(path)
+ if len(matches) != 3 {
+ return nil
}
+ deadline, err := strconv.ParseInt(matches[2], 10, 64)
+ if err != nil {
+ log.Printf("EmptyTrash: %v: ParseInt(%v): %v", path, matches[2], err)
+ return nil
+ }
+ bytesInTrash += info.Size()
+ blocksInTrash++
+ if deadline > time.Now().Unix() {
+ return nil
+ }
+ err = os.Remove(path)
+ if err != nil {
+ log.Printf("EmptyTrash: Remove %v: %v", path, err)
+ return nil
+ }
+ bytesDeleted += info.Size()
+ blocksDeleted++
return nil
})
if err != nil {
log.Printf("EmptyTrash error for %v: %v", v.String(), err)
- } else {
- log.Printf("EmptyTrash stats for %v: Bytes deleted %v; Blocks deleted %v; Bytes remaining in trash: %v; Blocks remaining in trash: %v",
- v.String(), bytesDeleted, blocksDeleted, bytesInTrash, blocksInTrash)
}
- return nil
+ log.Printf("EmptyTrash stats for %v: Deleted %v bytes in %v blocks. Remaining in trash: %v bytes in %v blocks.", v.String(), bytesDeleted, blocksDeleted, bytesInTrash-bytesDeleted, blocksInTrash-blocksDeleted)
}