8554: Dedup Get() checks, add comments, fix up regexp.

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

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index e52dba8032ea2b08202be31ce28825bc8bc63079..043ab69b17c255aa463fe8259a777cec682453f5 100644 (file)
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -453,16 +453,15 @@ func UntrashHandler(resp http.ResponseWriter, req *http.Request) {
        var numNotFound int
        for _, vol := range KeepVM.AllWritable() {
                err := vol.Untrash(hash)
-               if err == nil || err == ErrNotImplemented {
+
+               if os.IsNotExist(err) {
+                       numNotFound++
+               } else if err != nil {
+                       log.Printf("Error untrashing %v on volume %v", hash, vol.String())
+                       failedOn = append(failedOn, vol.String())
+               } else {
                        log.Printf("Untrashed %v on volume %v", hash, vol.String())
                        untrashedOn = append(untrashedOn, vol.String())
-               } else {
-                       if os.IsNotExist(err) {
-                               numNotFound++
-                       } else {
-                               log.Printf("Error untrashing %v on volume %v", hash, vol.String())
-                               failedOn = append(failedOn, vol.String())
-                       }
                }
        }