X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6ac861fd4a44cb39371a66d96b77ad7a41c85d3b..fcbb743e3de63e93280f2fbeedea49f98430d26f:/services/keepstore/handlers.go diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go index e52dba8032..043ab69b17 100644 --- 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()) - } } }