ETCM-446: Configure 12 hour stats duration.

Author: aakoshh

src/main/resources/application.conf

@@ -177,9 +177,10 @@ mantis {
 
       # Resolution of moving window of peer statistics.
       # Will be multiplied by `stat-slot-count` to give the overall length of peer statistics availability.
-      stat-slot-duration = 1.minute
+      stat-slot-duration = 10.minutes
+
       # How many slots of peer statistics to keep in the moving window, e.g. 60 * 1.minute to keep stats for the last hour with 1 minute resolution.
-      stat-slot-count = 60
+      stat-slot-count = 72
     }
 
     rpc {

src/main/scala/io/iohk/ethereum/network/PeerManagerActor.scala

@@ -271,7 +271,7 @@ class PeerManagerActor(
         handshakedPeer.ref ! PeerActor.DisconnectPeer(Disconnect.Reasons.TooManyPeers)
 
         // It looks like all incoming slots are taken; try to make some room.
-        schedulePruningIncomingPeers()
+        self ! SchedulePruneIncomingPeers
 
         context become listening(connectedPeers)
 
@@ -302,18 +302,18 @@ class PeerManagerActor(
     (pendingPeer, newConnectedPeers)
   }
 
-  /** Ask for statistics and try to prune incoming peers when they arrive. */
-  private def schedulePruningIncomingPeers(): Unit = {
-    implicit val timeout: Timeout = Timeout(peerConfiguration.updateNodesInterval)
-    // Picking the minimum pruning age is fair for anyone
-    val window = peerConfiguration.minPruneAge
-    (peerStatistics ? PeerStatisticsActor.GetStatsForAll(window))
-      .mapTo[PeerStatisticsActor.StatsForAll]
-      .map(PruneIncomingPeers(_))
-      .pipeTo(self)
-  }
-
   private def handlePruning(connectedPeers: ConnectedPeers): Receive = {
+    case SchedulePruneIncomingPeers =>
+      implicit val timeout: Timeout = Timeout(peerConfiguration.updateNodesInterval)
+
+      // Ask for the whole statistics duration, we'll use averages to make it fair.
+      val window = peerConfiguration.statSlotCount * peerConfiguration.statSlotDuration
+
+      (peerStatistics ? PeerStatisticsActor.GetStatsForAll(window))
+        .mapTo[PeerStatisticsActor.StatsForAll]
+        .map(PruneIncomingPeers(_))
+        .pipeTo(self)
+
     case PruneIncomingPeers(PeerStatisticsActor.StatsForAll(stats)) =>
       val prunedConnectedPeers = pruneIncomingPeers(connectedPeers, stats)
 
@@ -505,6 +505,7 @@ object PeerManagerActor {
 
   case class PeerAddress(value: String) extends BlackListId
 
+  case object SchedulePruneIncomingPeers
   case class PruneIncomingPeers(stats: PeerStatisticsActor.StatsForAll)
 
   /** Number of new connections the node should try to open at any given time. */