Skip to content

Fix for vtexplain #4413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
demmer merged 4 commits into from
Dec 5, 2018
Merged

Fix for vtexplain #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d73c34
Make sure tabletserver is shutdown before cleaning up DB
Dec 2, 2018
18e1aa1
Stop server and also close te/messager/watcher
Dec 2, 2018
40ef7fe
This actually stops everything we need
Dec 2, 2018
b654418
Refactor place where clanup is done so it's clearer
Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go/cmd/vtexplain/vtexplain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func getFileParam(flag, flagFile, name string) (string, error) {
}

func main() {
defer vtexplain.Stop()
defer exit.RecoverAll()
defer logutil.Flush()

Expand Down Expand Up @@ -178,7 +179,5 @@ func parseAndRun() error {
fmt.Print(vtexplain.ExplainsAsJSON(plans))
}

vtexplain.Stop()

return nil
}
3 changes: 3 additions & 0 deletions go/vt/vtexplain/vtexplain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ func Init(vSchemaStr, sqlSchema string, opts *Options) error {
func Stop() {
// Cleanup all created fake dbs.
if explainTopo != nil {
for _, conn := range explainTopo.TabletConns {
conn.tsv.StopService()
}
for _, conn := range explainTopo.TabletConns {
conn.db.Close()
}
Expand Down