Merge pull request vitessio#7391 from planetscale/ds-80-backport-6989

8.0 backport: Correctly initialize the TabletType stats

go/vt/vttablet/tabletmanager/tm_init.go

@@ -631,6 +631,7 @@ func (tm *TabletManager) exportStats() {
 	tablet := tm.Tablet()
 	statsKeyspace.Set(tablet.Keyspace)
 	statsShard.Set(tablet.Shard)
+	statsTabletType.Set(topoproto.TabletTypeLString(tm.tmState.tablet.Type))
 	if key.KeyRangeIsPartial(tablet.KeyRange) {
 		statsKeyRangeStart.Set(hex.EncodeToString(tablet.KeyRange.Start))
 		statsKeyRangeEnd.Set(hex.EncodeToString(tablet.KeyRange.End))

go/vt/vttablet/tabletmanager/tm_init_test.go

@@ -124,6 +124,8 @@ func TestStartCreateKeyspaceShard(t *testing.T) {
 	tm := newTestTM(t, ts, 1, "ks", "0")
 	defer tm.Stop()
 
+	assert.Equal(t, "replica", statsTabletType.Get())
+
 	_, err := ts.GetShard(ctx, "ks", "0")
 	require.NoError(t, err)
 
@@ -235,6 +237,7 @@ func TestCheckMastership(t *testing.T) {
 	assert.Equal(t, topodatapb.TabletType_MASTER, ti.Type)
 	ter0 := ti.GetMasterTermStartTime()
 	assert.Equal(t, now, ter0)
+	assert.Equal(t, "master", statsTabletType.Get())
 	tm.Stop()
 
 	// 3. Delete the tablet record. The shard record still says that we are the

go/vt/vttablet/tabletmanager/tm_state_test.go

@@ -182,13 +182,15 @@ func TestStateChangeTabletType(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, topodatapb.TabletType_MASTER, ti.Type)
 	assert.NotNil(t, ti.MasterTermStartTime)
+	assert.Equal(t, "master", statsTabletType.Get())
 
 	err = tm.tmState.ChangeTabletType(ctx, topodatapb.TabletType_REPLICA, DBActionNone)
 	require.NoError(t, err)
 	ti, err = ts.GetTablet(ctx, alias)
 	require.NoError(t, err)
 	assert.Equal(t, topodatapb.TabletType_REPLICA, ti.Type)
 	assert.Nil(t, ti.MasterTermStartTime)
+	assert.Equal(t, "replica", statsTabletType.Get())
 }
 
 func TestPublishStateNew(t *testing.T) {