Merge pull request vitessio#4413 from tinyspeck/fix-for-vtexplain

Fix for vtexplain

go/cmd/vtexplain/vtexplain.go

@@ -122,6 +122,7 @@ func getFileParam(flag, flagFile, name string) (string, error) {
 }
 
 func main() {
+	defer vtexplain.Stop()
 	defer exit.RecoverAll()
 	defer logutil.Flush()
 
@@ -178,7 +179,5 @@ func parseAndRun() error {
 		fmt.Print(vtexplain.ExplainsAsJSON(plans))
 	}
 
-	vtexplain.Stop()
-
 	return nil
 }

go/vt/vtexplain/vtexplain.go

@@ -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()
 		}