Merge branch '8959-python-gflags-dependencies'

[arvados.git] / services / keepstore / volume_unix.go

diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index 9183a398f34ca89cc40eb6b6c5f1c2122f831a84..996068cf3d2438f71364b0b2c9ddafcdbd712c54 100644 (file)
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -420,16 +420,20 @@ func (v *UnixVolume) Untrash(loc string) (err error) {
                return MethodDisabledError
        }
 
-       prefix := fmt.Sprintf("%v.trash.", loc)
        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)
        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 {
                                break
@@ -437,6 +441,10 @@ func (v *UnixVolume) Untrash(loc string) (err error) {
                }
        }
 
+       if foundTrash == false {
+               return os.ErrNotExist
+       }
+
        return
 }
 
@@ -532,41 +540,43 @@ func (v *UnixVolume) translateError(err error) error {
        }
 }
 
+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 {
-                       return err
+                       log.Printf("EmptyTrash: filepath.Walk: %v: %v", path, err)
+                       return nil
                }
-
-               if !info.Mode().IsDir() {
-                       matches := trashLocRegexp.FindStringSubmatch(path)
-                       if len(matches) == 3 {
-                               deadline, err := strconv.ParseInt(matches[2], 10, 64)
-                               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++
-                                       }
-                               }
-                       }
+               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
        })
 
@@ -574,7 +584,5 @@ func (v *UnixVolume) EmptyTrash() error {
                log.Printf("EmptyTrash error for %v: %v", v.String(), err)
        }
 
-       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)
 }