Code review feedback

Signed-off-by: Nick Pillitteri <[email protected]>
grafana · Jan 10, 2025 · e42e7c9 · e42e7c9
1 parent 655630e
commit e42e7c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/querier/blocks_store_queryable.go b/pkg/querier/blocks_store_queryable.go
@@ -244,16 +244,14 @@ func NewBlocksStoreQueryableFromConfig(querierCfg Config, gatewayCfg storegatewa
 		return nil, errors.Wrap(err, "failed to create store-gateway ring client")
 	}
 
-	var expandedReplication storegateway.ExpandedReplication
+	var expandedReplication storegateway.ExpandedReplication = storegateway.NewNopExpandedReplication()
 	if gatewayCfg.ExpandedReplication.Enabled {
 		expandedReplication = storegateway.NewMaxTimeExpandedReplication(
 			gatewayCfg.ExpandedReplication.MaxTimeThreshold,
 			// Exclude blocks which have recently become eligible for expanded replication, in order to give
 			// enough time to store-gateways to discover and load them (3 times the sync interval)
 			mimir_tsdb.NewBlockDiscoveryDelayMultiplier*storageCfg.BucketStore.SyncInterval,
 		)
-	} else {
-		expandedReplication = storegateway.NewNopExpandedReplication()
 	}
 
 	stores, err = newBlocksStoreReplicationSet(storesRing, randomLoadBalancing, expandedReplication, limits, querierCfg.StoreGatewayClient, logger, reg)

diff --git a/pkg/storegateway/gateway.go b/pkg/storegateway/gateway.go
@@ -179,11 +179,9 @@ func newStoreGateway(gatewayCfg Config, storageCfg mimir_tsdb.BlocksStorageConfi
 		return nil, errors.Wrap(err, "create ring client")
 	}
 
-	var expandedReplication ExpandedReplication
+	var expandedReplication ExpandedReplication = NewNopExpandedReplication()
 	if gatewayCfg.ExpandedReplication.Enabled {
 		expandedReplication = NewMaxTimeExpandedReplication(gatewayCfg.ExpandedReplication.MaxTimeThreshold, 0)
-	} else {
-		expandedReplication = NewNopExpandedReplication()
 	}
 
 	shardingStrategy = NewShuffleShardingStrategy(g.ring, lifecyclerCfg.ID, lifecyclerCfg.Addr, expandedReplication, limits, logger)