Skip to content

Commit e084d42

Browse files
timvaillancourtmakinje16
authored andcommitted
slack-19.0: backport v22 VTOrc optimizations, part 2 (#613)
* `vtorc`: remove duplicate instance read from backend (vitessio#17834) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * `vtorc`: add index for `inst.ReadInstanceClusterAttributes` table scan Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> --------- Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
1 parent 10e6e8b commit e084d42

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

go/vt/vtorc/db/generate_base.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ CREATE INDEX last_checked_idx_database_instance ON database_instance(last_checke
118118
CREATE INDEX last_seen_idx_database_instance ON database_instance(last_seen)
119119
`,
120120
`
121+
CREATE INDEX hostname_port_database_instance ON database_instance(hostname, port)
122+
`,
123+
`
121124
DROP TABLE IF EXISTS audit
122125
`,
123126
`

go/vt/vtorc/inst/instance_dao.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func ReadTopologyInstanceBufferable(tabletAlias string, latency *stopwatch.Named
204204
goto Cleanup
205205
}
206206

207-
fs, err = fullStatus(tabletAlias)
207+
fs, err = fullStatus(tablet)
208208
if err != nil {
209209
goto Cleanup
210210
}

go/vt/vtorc/inst/tablet_dao.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ func InitializeTMC() tmclient.TabletManagerClient {
4444
}
4545

4646
// fullStatus gets the full status of the MySQL running in vttablet.
47-
func fullStatus(tabletAlias string) (*replicationdatapb.FullStatus, error) {
48-
tablet, err := ReadTablet(tabletAlias)
49-
if err != nil {
50-
return nil, err
51-
}
47+
func fullStatus(tablet *topodatapb.Tablet) (*replicationdatapb.FullStatus, error) {
5248
tmcCtx, tmcCancel := context.WithTimeout(context.Background(), topo.RemoteOperationTimeout)
5349
defer tmcCancel()
5450
return tmc.FullStatus(tmcCtx, tablet)

0 commit comments

Comments
 (0)