consolidate deferred functions

Signed-off-by: Shlomi Noach <[email protected]>
vitessio · Jan 18, 2024 · e4f12d2 · e4f12d2
1 parent 3bcfb19
commit e4f12d2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/go/vt/vttablet/tabletserver/throttle/throttler.go b/go/vt/vttablet/tabletserver/throttle/throttler.go
@@ -657,10 +657,12 @@ func (throttler *Throttler) Operate(ctx context.Context, wg *sync.WaitGroup) {
 
 	wg.Add(1)
 	go func() {
-		defer wg.Done()
-		defer throttler.aggregatedMetrics.Flush()
-		defer throttler.recentApps.Flush()
-		defer throttler.nonLowPriorityAppRequestsThrottled.Flush()
+		defer func() {
+			throttler.aggregatedMetrics.Flush()
+			throttler.recentApps.Flush()
+			throttler.nonLowPriorityAppRequestsThrottled.Flush()
+			wg.Done()
+		}()
 		// we do not flush throttler.throttledApps because this is data submitted by the user; the user expects the data to survive a disable+enable
 
 		defer log.Infof("Throttler: Operate terminated, tickers stopped")