Merge pull request #4619 from HubSpot/cache_cell_regions

healthcheck: Cache regions in tablet_stats_cache
vitessio · Feb 15, 2019 · dd8cb89 · dd8cb89
2 parents 19f6421 + 64c7c61
commit dd8cb89
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/go/vt/discovery/tablet_stats_cache.go b/go/vt/discovery/tablet_stats_cache.go
@@ -56,6 +56,8 @@ type TabletStatsCache struct {
 	entries map[string]map[string]map[topodatapb.TabletType]*tabletStatsCacheEntry
 	// tsm is a helper to broadcast aggregate stats.
 	tsm srvtopo.TargetStatsMultiplexer
+	// cellRegions is a cache of cell regions
+	cellRegions map[string]string
 }
 
 // tabletStatsCacheEntry is the per keyspace/shard/tabletType
@@ -134,6 +136,7 @@ func newTabletStatsCache(hc HealthCheck, ts *topo.Server, cell string, setListen
 		aggregatesChan: make(chan []*srvtopo.TargetStatsEntry, 100),
 		entries:        make(map[string]map[string]map[topodatapb.TabletType]*tabletStatsCacheEntry),
 		tsm:            srvtopo.NewTargetStatsMultiplexer(),
+		cellRegions:    make(map[string]string),
 	}
 
 	if setListener {
@@ -194,12 +197,24 @@ func (tc *TabletStatsCache) getOrCreateEntry(target *querypb.Target) *tabletStat
 }
 
 func (tc *TabletStatsCache) getRegionByCell(cell string) string {
-	return topo.GetRegionByCell(context.Background(), tc.ts, cell)
+	tc.mu.Lock()
+	defer tc.mu.Unlock()
+
+	if region, ok := tc.cellRegions[cell]; ok {
+		return region
+	}
+
+	region := topo.GetRegionByCell(context.Background(), tc.ts, cell)
+	tc.cellRegions[cell] = region
+
+	return region
 }
 
 // StatsUpdate is part of the HealthCheckStatsListener interface.
 func (tc *TabletStatsCache) StatsUpdate(ts *TabletStats) {
-	if ts.Target.TabletType != topodatapb.TabletType_MASTER && ts.Tablet.Alias.Cell != tc.cell && tc.getRegionByCell(ts.Tablet.Alias.Cell) != tc.getRegionByCell(tc.cell) {
+	if ts.Target.TabletType != topodatapb.TabletType_MASTER &&
+		ts.Tablet.Alias.Cell != tc.cell &&
+		tc.getRegionByCell(ts.Tablet.Alias.Cell) != tc.getRegionByCell(tc.cell) {
 		// this is for a non-master tablet in a different cell and a different region, drop it
 		return
 	}

diff --git a/go/vt/discovery/tablet_stats_cache_test.go b/go/vt/discovery/tablet_stats_cache_test.go
@@ -38,8 +38,9 @@ func TestTabletStatsCache(t *testing.T) {
 	// HealthCheck object, so we can't call NewTabletStatsCache.
 	// So we just construct this object here.
 	tsc := &TabletStatsCache{
-		cell:    "cell",
-		entries: make(map[string]map[string]map[topodatapb.TabletType]*tabletStatsCacheEntry),
+		cell:        "cell",
+		entries:     make(map[string]map[string]map[topodatapb.TabletType]*tabletStatsCacheEntry),
+		cellRegions: make(map[string]string),
 	}
 
 	// empty