X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5138af3e4d679bd026849804603c36d81c1a2543..8a56164a8a9d3c7b3b58df77d1e5aa3f1d6cad12:/services/keepstore/volume_unix.go

diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index 3f1df64c4c..7aff85e59a 100644
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -181,26 +181,24 @@ func (v *UnixVolume) stat(path string) (os.FileInfo, error) {
 	return stat, err
 }
 
-// Get retrieves a block identified by the locator string "loc", and
-// returns its contents as a byte slice.
-//
-// Get returns a nil buffer IFF it returns a non-nil error.
-func (v *UnixVolume) Get(loc string) ([]byte, error) {
+// Get retrieves a block, copies it to the given slice, and returns
+// the number of bytes copied.
+func (v *UnixVolume) Get(loc string, buf []byte) (int, error) {
 	path := v.blockPath(loc)
 	stat, err := v.stat(path)
 	if err != nil {
-		return nil, v.translateError(err)
+		return 0, v.translateError(err)
+	}
+	if stat.Size() > int64(len(buf)) {
+		return 0, TooLongError
 	}
-	buf := bufs.Get(int(stat.Size()))
+	var read int
+	size := int(stat.Size())
 	err = v.getFunc(path, func(rdr io.Reader) error {
-		_, err = io.ReadFull(rdr, buf)
+		read, err = io.ReadFull(rdr, buf[:size])
 		return err
 	})
-	if err != nil {
-		bufs.Put(buf)
-		return nil, err
-	}
-	return buf, nil
+	return read, err
 }
 
 // Compare returns nil if Get(loc) would return the same content as
@@ -420,16 +418,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 +439,10 @@ func (v *UnixVolume) Untrash(loc string) (err error) {
 		}
 	}
 
+	if foundTrash == false {
+		return os.ErrNotExist
+	}
+
 	return
 }
 
@@ -532,6 +538,8 @@ func (v *UnixVolume) translateError(err error) error {
 	}
 }
 
+var unixTrashLocRegexp = 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() {
@@ -540,33 +548,33 @@ func (v *UnixVolume) EmptyTrash() {
 
 	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 := unixTrashLocRegexp.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,5 +582,5 @@ func (v *UnixVolume) EmptyTrash() {
 		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)
+	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)
 }