Fixing tenant metering and removing unused data structures (#1683)

filodb · Nov 2, 2023 · 881941a · 881941a
1 parent c5b5a1a
commit 881941a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/coordinator/src/main/scala/filodb.coordinator/ShardManager.scala b/coordinator/src/main/scala/filodb.coordinator/ShardManager.scala
@@ -37,7 +37,6 @@ private[coordinator] final class ShardManager(settings: FilodbSettings,
   private val _coordinators = new mutable.LinkedHashMap[Address, ActorRef]
   private val _errorShardReassignedAt = new mutable.HashMap[DatasetRef, mutable.HashMap[Int, Long]]
 
-  // TODO move to startup-v2
   private val _tenantIngestionMeteringOpt =
     if (settings.config.getBoolean("shard-key-level-ingestion-metrics-enabled")) {
       val inst = TenantIngestionMetering(

diff --git a/coordinator/src/main/scala/filodb/coordinator/v2/NewNodeCoordinatorActor.scala b/coordinator/src/main/scala/filodb/coordinator/v2/NewNodeCoordinatorActor.scala
@@ -42,7 +42,6 @@ private[filodb] final class NewNodeCoordinatorActor(memStore: TimeSeriesStore,
   private val ingestionActors = new mutable.HashMap[DatasetRef, ActorRef]
   private val queryActors = new mutable.HashMap[DatasetRef, ActorRef]
   private val localShardMaps = new mutable.HashMap[DatasetRef, ShardMapper]
-  private val shardsOnThisNode = new mutable.HashMap[DatasetRef, Seq[Int]]
   private val ingestionConfigs = new mutable.HashMap[DatasetRef, IngestionConfig]()
   private val shardStats = new mutable.HashMap[DatasetRef, ShardHealthStats]()
 
@@ -94,7 +93,6 @@ private[filodb] final class NewNodeCoordinatorActor(memStore: TimeSeriesStore,
     val mapper = localShardMaps(dataset.ref)
     val shardsToStart = clusterDiscovery.shardsForLocalhost(ic.numShards)
     shardsToStart.foreach(sh => updateFromShardEvent(ShardAssignmentStarted(dataset.ref, sh, self)))
-    shardsOnThisNode.put(dataset.ref, shardsToStart)
     ingestionActors(dataset.ref) ! ShardIngestionState(0, dataset.ref, mapper)
   }
 
@@ -151,12 +149,14 @@ private[filodb] final class NewNodeCoordinatorActor(memStore: TimeSeriesStore,
   }
 
   private def startTenantIngestionMetering(): Unit = {
-    logger.info(s"Starting tenant level ingestion cardinality metering...")
-    val inst = TenantIngestionMetering(
-      settings,
-      dsIterProducer = () => { localShardMaps.keysIterator },
-      coordActorProducer = () => self)
-    inst.schedulePeriodicPublishJob()
+    if (settings.config.getBoolean("shard-key-level-ingestion-metrics-enabled")) {
+      logger.info(s"Starting tenant level ingestion cardinality metering...")
+      val inst = TenantIngestionMetering(
+        settings,
+        dsIterProducer = () => { localShardMaps.keysIterator },
+        coordActorProducer = () => self)
+      inst.schedulePeriodicPublishJob()
+    }
   }
 
   def queryHandlers: Receive = LoggingReceive {