From 74b50623b6350dfe0288f71a3c1c87c2dee75f43 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 27 Apr 2018 13:44:44 +0200 Subject: [PATCH 1/2] swarm/api: remove redundant log line --- swarm/api/http/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 2717d0b7a8..ea95ba96fe 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -863,8 +863,7 @@ func (s *Server) ServeHTTP(rw http.ResponseWriter, r *http.Request) { req.uri = uri - log.Debug("parsed request path", "ruid", req.ruid, "method", req.Method, "uri", req.uri) - log.Debug("parsed request path", "uri.Addr", req.uri.Addr, "uri.path", req.uri.Path, "uri.Scheme", req.uri.Scheme) + log.Debug("parsed request path", "ruid", req.ruid, "method", req.Method, "uri.Addr", req.uri.Addr, "uri.Path", req.uri.Path, "uri.Scheme", req.uri.Scheme) switch r.Method { case "POST": From a9dbf154c203b8d68ab822332c98389a770826c1 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 27 Apr 2018 14:01:03 +0200 Subject: [PATCH 2/2] swarm/storage: update requests cache gauge every 5 sec. --- swarm/storage/localstore.go | 5 +++++ swarm/swarm.go | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index 2cbb269aa7..88b27bd6ef 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -211,6 +211,11 @@ func (self *LocalStore) GetOrCreateRequest(key Key) (chunk *Chunk, created bool) return chunk, true } +// RequestsCacheLen returns the current number of outgoing requests stored in the cache +func (self *LocalStore) RequestsCacheLen() int { + return self.memStore.requests.Len() +} + // Close the local store func (self *LocalStore) Close() { self.DbStore.Close() diff --git a/swarm/swarm.go b/swarm/swarm.go index 6b235118f8..0670446965 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -58,7 +58,7 @@ var ( startCounter = metrics.NewRegisteredCounter("stack,start", nil) stopCounter = metrics.NewRegisteredCounter("stack,stop", nil) uptimeGauge = metrics.NewRegisteredGauge("stack.uptime", nil) - cacheSizeGauge = metrics.NewRegisteredGauge("storage.db.cache.size", nil) + requestsCacheGauge = metrics.NewRegisteredGauge("storage.cache.requests.size", nil) ) // the swarm stack @@ -420,6 +420,7 @@ func (self *Swarm) periodicallyUpdateGauges() { func (self *Swarm) updateGauges() { uptimeGauge.Update(time.Since(startTime).Nanoseconds()) + requestsCacheGauge.Update(int64(self.lstore.RequestsCacheLen())) } // implements the node.Service interface