Merge pull request #574 from shutter-network/feat/boot-no-limits

Remove limits on boot nodes

Author: blockchainluffy

.circleci/config.yml

@@ -247,7 +247,7 @@ jobs:
             docker buildx build \
               --push \
               --progress plain \
-              --platform linux/arm64,linux/amd64 \
+              --platform linux/amd64 \
               -f docker/build-src/rolling-shutter/Dockerfile \
               -t "${DOCKER_TAG}" \
               .

rolling-shutter/medley/metricsserver/metricsserver.go

@@ -14,6 +14,8 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 
+var startTime = time.Now()
+
 var metricsGoBuildInfo = prometheus.NewGauge(
 	prometheus.GaugeOpts{
 		Namespace: "go",
@@ -26,9 +28,22 @@ var metricsGoBuildInfo = prometheus.NewGauge(
 	},
 )
 
+var metricsUptime = prometheus.NewGaugeFunc(
+	prometheus.GaugeOpts{
+		Namespace: "",
+		Subsystem: "",
+		Name:      "uptime_seconds",
+		Help:      "Number of seconds the Node has been running",
+	},
+	func() float64 {
+		return float64(time.Since(startTime).Milliseconds()) / 1000
+	},
+)
+
 func init() {
 	metricsGoBuildInfo.Set(1)
 	prometheus.MustRegister(metricsGoBuildInfo)
+	prometheus.MustRegister(metricsUptime)
 }
 
 type MetricsServer struct {

rolling-shutter/p2p/metrics.go

@@ -5,6 +5,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/rs/zerolog/log"
 )
 
 var metricsP2PMessageValidationTime = prometheus.NewHistogramVec(
@@ -57,6 +58,16 @@ var metricsP2PPeerPing = prometheus.NewGaugeVec(
 	[]string{"our_id", "peer_id"},
 )
 
+var metricsP2PPeerUserAgent = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "p2p",
+		Name:      "peer_user_agent",
+		Help:      "Collection of the user agent of a peer ID.",
+	},
+	[]string{"peer_id", "user_agent"},
+)
+
 func collectPeerAddresses(p peer.AddrInfo) {
 	for _, multiAddr := range p.Addrs {
 		metricsP2PPeerTuples.WithLabelValues(p.ID.String(), multiAddr.String()).Set(1)
@@ -69,6 +80,7 @@ func init() {
 	prometheus.MustRegister(metricsP2PPeerTuples)
 	prometheus.MustRegister(metricsP2PPeerConnectedness)
 	prometheus.MustRegister(metricsP2PPeerPing)
+	prometheus.MustRegister(metricsP2PPeerUserAgent)
 }
 
 func updatePeersMetrics(h host.Host, peerIds mapset.Set[peer.ID]) {
@@ -80,5 +92,13 @@ func updatePeersMetrics(h host.Host, peerIds mapset.Set[peer.ID]) {
 		if peerPing != 0 {
 			metricsP2PPeerPing.WithLabelValues(ourID, p.String()).Set(peerPing.Seconds())
 		}
+		ua, err := h.Peerstore().Get(p, "AgentVersion")
+		if err != nil {
+			log.Warn().Str("peer", p.String()).Msg("Can't get user agent for peer")
+			continue
+		}
+		if ua != nil {
+			metricsP2PPeerUserAgent.WithLabelValues(p.String(), ua.(string)).Set(1)
+		}
 	}
 }

rolling-shutter/p2p/p2p.go

@@ -12,6 +12,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/discovery/routing"
 	"github.com/libp2p/go-libp2p/p2p/discovery/util"
+	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	rhost "github.com/libp2p/go-libp2p/p2p/host/routed"
 	"github.com/libp2p/go-libp2p/p2p/net/connmgr"
 	"github.com/multiformats/go-multiaddr"
@@ -268,6 +269,14 @@ func createHost(
 				libp2p.EnableRelayService(),
 			)
 		}
+		if config.IsBootstrapNode || config.IsAccessNode {
+			// No resource limits on boot and access nodes for now
+			mgr, err := rcmgr.NewResourceManager(rcmgr.NewFixedLimiter(rcmgr.InfiniteLimits))
+			if err != nil {
+				return nil, nil, err
+			}
+			options = append(options, libp2p.ResourceManager(mgr))
+		}
 	}
 
 	p2pHost, err := libp2p.New(options...)