refactor: rename variable

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Jan 28, 2025 · ae39a79 · ae39a79
1 parent 130f090
commit ae39a79
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 41 deletions.
diff --git a/go/vt/vttablet/tabletserver/state_manager.go b/go/vt/vttablet/tabletserver/state_manager.go
@@ -97,7 +97,7 @@ type stateManager struct {
 	replHealthy          bool
 	demotePrimaryStalled bool
 	lameduck             bool
-	dhMonitor            DiskHealthMonitor
+	diskHealthMonitor    DiskHealthMonitor
 	alsoAllow            []topodatapb.TabletType
 	reason               string
 	transitionErr        error
@@ -778,7 +778,7 @@ func (sm *stateManager) IsServing() bool {
 }
 
 func (sm *stateManager) isServingLocked() bool {
-	return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.demotePrimaryStalled && !sm.lameduck && !sm.dhMonitor.IsDiskStalled()
+	return sm.state == StateServing && sm.wantState == StateServing && sm.replHealthy && !sm.demotePrimaryStalled && !sm.lameduck && !sm.diskHealthMonitor.IsDiskStalled()
 }
 
 func (sm *stateManager) AppendDetails(details []*kv) []*kv {

diff --git a/go/vt/vttablet/tabletserver/state_manager_test.go b/go/vt/vttablet/tabletserver/state_manager_test.go
@@ -42,7 +42,7 @@ var testNow = time.Now()
 
 func TestStateManagerStateByName(t *testing.T) {
 	sm := &stateManager{
-		dhMonitor: newNoopDiskHealthMonitor(),
+		diskHealthMonitor: newNoopDiskHealthMonitor(),
 	}
 
 	sm.replHealthy = true
@@ -162,7 +162,7 @@ func TestIsServingLocked(t *testing.T) {
 	sm := newTestStateManager()
 	defer sm.StopService()
 	tdm := &testDiskMonitor{isDiskStalled: false}
-	sm.dhMonitor = tdm
+	sm.diskHealthMonitor = tdm
 
 	err := sm.SetServingType(topodatapb.TabletType_REPLICA, testNow, StateServing, "")
 	require.NoError(t, err)
@@ -803,24 +803,24 @@ func newTestStateManager() *stateManager {
 	parser := sqlparser.NewTestParser()
 	env := tabletenv.NewEnv(vtenv.NewTestEnv(), cfg, "StateManagerTest")
 	sm := &stateManager{
-		statelessql: NewQueryList("stateless", parser),
-		statefulql:  NewQueryList("stateful", parser),
-		olapql:      NewQueryList("olap", parser),
-		hs:          newHealthStreamer(env, &topodatapb.TabletAlias{}, schema.NewEngine(env)),
-		se:          &testSchemaEngine{},
-		rt:          &testReplTracker{lag: 1 * time.Second},
-		vstreamer:   &testSubcomponent{},
-		tracker:     &testSubcomponent{},
-		watcher:     &testSubcomponent{},
-		qe:          &testQueryEngine{},
-		txThrottler: &testTxThrottler{},
-		te:          &testTxEngine{},
-		messager:    &testSubcomponent{},
-		ddle:        &testOnlineDDLExecutor{},
-		dhMonitor:   newNoopDiskHealthMonitor(),
-		throttler:   &testLagThrottler{},
-		tableGC:     &testTableGC{},
-		rw:          newRequestsWaiter(),
+		statelessql:       NewQueryList("stateless", parser),
+		statefulql:        NewQueryList("stateful", parser),
+		olapql:            NewQueryList("olap", parser),
+		hs:                newHealthStreamer(env, &topodatapb.TabletAlias{}, schema.NewEngine(env)),
+		se:                &testSchemaEngine{},
+		rt:                &testReplTracker{lag: 1 * time.Second},
+		vstreamer:         &testSubcomponent{},
+		tracker:           &testSubcomponent{},
+		watcher:           &testSubcomponent{},
+		qe:                &testQueryEngine{},
+		txThrottler:       &testTxThrottler{},
+		te:                &testTxEngine{},
+		messager:          &testSubcomponent{},
+		ddle:              &testOnlineDDLExecutor{},
+		diskHealthMonitor: newNoopDiskHealthMonitor(),
+		throttler:         &testLagThrottler{},
+		tableGC:           &testTableGC{},
+		rw:                newRequestsWaiter(),
 	}
 	sm.Init(env, &querypb.Target{})
 	sm.hs.InitDBConfig(&querypb.Target{})

diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -190,24 +190,24 @@ func NewTabletServer(ctx context.Context, env *vtenv.Environment, name string, c
 	tsv.onlineDDLExecutor = onlineddl.NewExecutor(tsv, alias, topoServer, tsv.lagThrottler, tabletTypeFunc, tsv.onlineDDLExecutorToggleTableBuffer, tsv.tableGC.RequestChecks, tsv.te.preparedPool.IsEmptyForTable)
 
 	tsv.sm = &stateManager{
-		statelessql: tsv.statelessql,
-		statefulql:  tsv.statefulql,
-		olapql:      tsv.olapql,
-		hs:          tsv.hs,
-		se:          tsv.se,
-		rt:          tsv.rt,
-		vstreamer:   tsv.vstreamer,
-		tracker:     tsv.tracker,
-		watcher:     tsv.watcher,
-		qe:          tsv.qe,
-		txThrottler: tsv.txThrottler,
-		te:          tsv.te,
-		messager:    tsv.messager,
-		ddle:        tsv.onlineDDLExecutor,
-		throttler:   tsv.lagThrottler,
-		tableGC:     tsv.tableGC,
-		rw:          newRequestsWaiter(),
-		dhMonitor:   newDiskHealthMonitor(ctx),
+		statelessql:       tsv.statelessql,
+		statefulql:        tsv.statefulql,
+		olapql:            tsv.olapql,
+		hs:                tsv.hs,
+		se:                tsv.se,
+		rt:                tsv.rt,
+		vstreamer:         tsv.vstreamer,
+		tracker:           tsv.tracker,
+		watcher:           tsv.watcher,
+		qe:                tsv.qe,
+		txThrottler:       tsv.txThrottler,
+		te:                tsv.te,
+		messager:          tsv.messager,
+		ddle:              tsv.onlineDDLExecutor,
+		throttler:         tsv.lagThrottler,
+		tableGC:           tsv.tableGC,
+		rw:                newRequestsWaiter(),
+		diskHealthMonitor: newDiskHealthMonitor(ctx),
 	}
 
 	tsv.exporter.NewGaugeFunc("TabletState", "Tablet server state", func() int64 { return int64(tsv.sm.State()) })
@@ -770,7 +770,7 @@ func (tsv *TabletServer) SetDemotePrimaryStalled() {
 
 // IsDiskStalled returns if the disk is stalled or not.
 func (tsv *TabletServer) IsDiskStalled() bool {
-	return tsv.sm.dhMonitor.IsDiskStalled()
+	return tsv.sm.diskHealthMonitor.IsDiskStalled()
 }
 
 // CreateTransaction creates the metadata for a 2PC transaction.