18790: Fix logging noise from ENOENT.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/localdb/container_gateway.go b/lib/controller/localdb/container_gateway.go
index 77507901abb9e0b5cf2c68c8a999b5d27f468116..384f471db0d9b8d5b3a314ae1204c5c8beced8d5 100644 (file)
--- a/lib/controller/localdb/container_gateway.go
+++ b/lib/controller/localdb/container_gateway.go
@@ -21,6 +21,7 @@ import (
        "net/http"
        "net/http/httputil"
        "net/url"
+       "os"
        "strings"
 
        "git.arvados.org/arvados.git/lib/controller/rpc"
@@ -231,7 +232,7 @@ func (conn *Conn) serveEmptyDir(path string, w http.ResponseWriter, r *http.Requ
                FileSystem: webdav.NewMemFS(),
                LockSystem: webdavfs.NoLockSystem,
                Logger: func(r *http.Request, err error) {
-                       if err != nil {
+                       if err != nil && !os.IsNotExist(err) {
                                ctxlog.FromContext(r.Context()).WithError(err).Info("webdav error on empty collection fs")
                        }
                },

diff --git a/lib/crunchrun/container_gateway.go b/lib/crunchrun/container_gateway.go
index 12bdc6b7db0569da3305c85b294fc7b41d9eb88e..7fd82a8bfde4b31ea42afeb5e4c6254589c04e3f 100644 (file)
--- a/lib/crunchrun/container_gateway.go
+++ b/lib/crunchrun/container_gateway.go
@@ -326,8 +326,10 @@ func (gw *Gateway) handleLogsWebDAV(w http.ResponseWriter, r *http.Request) {
 }
 
 func (gw *Gateway) webdavLogger(r *http.Request, err error) {
-       if err != nil {
-               ctxlog.FromContext(r.Context()).WithError(err).Error("error reported by webdav handler")
+       if err != nil && !os.IsNotExist(err) {
+               ctxlog.FromContext(r.Context()).WithError(err).Info("error reported by webdav handler")
+       } else {
+               ctxlog.FromContext(r.Context()).WithError(err).Debug("webdav request log")
        }
 }