Migrate vtctlclient InitShardMaster => vtctldclient InitShardPrimary

Makefile

@@ -179,10 +179,10 @@ ifndef NOBANNER
 	echo $$(date): Compiling proto definitions
 endif
 
-$(PROTO_GO_OUTS): install_protoc-gen-go proto/*.proto
+$(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 	for name in $(PROTO_SRC_NAMES); do \
-		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -Iproto proto/$${name}.proto && \
-		goimports -local vitess.io/vitess -w vitess.io/vitess/go/vt/proto/$${name}/$${name}.pb.go; \
+		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -I${PWD}/dist/vt-protoc-3.6.1/include:proto proto/$${name}.proto && \
+		goimports -w vitess.io/vitess/go/vt/proto/$${name}/$${name}.pb.go; \
 	done
 	cp -Rf vitess.io/vitess/go/vt/proto/* go/vt/proto
 	rm -rf vitess.io/vitess/go/vt/proto/

examples/local/101_initial_cluster.sh

@@ -38,7 +38,7 @@ for i in 100 101 102; do
 done
 
 # set one of the replicas to master
-vtctlclient InitShardMaster -force commerce/0 zone1-100
+vtctldclient InitShardPrimary --force commerce/0 zone1-100
 
 # create the schema
 vtctlclient ApplySchema -sql-file create_commerce_schema.sql commerce

examples/local/201_customer_tablets.sh

@@ -25,4 +25,4 @@ for i in 200 201 202; do
 	CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient InitShardMaster -force customer/0 zone1-200
+vtctldclient InitShardPrimary --force customer/0 zone1-200

examples/local/302_new_shards.sh

@@ -29,5 +29,5 @@ for i in 400 401 402; do
 	SHARD=80- CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient InitShardMaster -force customer/-80 zone1-300
-vtctlclient InitShardMaster -force customer/80- zone1-400
+vtctldclient InitShardPrimary --force customer/-80 zone1-300
+vtctldclient InitShardPrimary --force customer/80- zone1-400

examples/local/env.sh

@@ -76,6 +76,7 @@ mkdir -p "${VTDATAROOT}/tmp"
 
 alias mysql="command mysql -h 127.0.0.1 -P 15306"
 alias vtctlclient="command vtctlclient -server localhost:15999 -log_dir ${VTDATAROOT}/tmp -alsologtostderr"
+alias vtctldclient="command vtctldclient --server localhost:15999"
 
 # Make sure aliases are expanded in non-interactive shell
 shopt -s expand_aliases

go/cmd/vtctldclient/commands.go

@@ -19,10 +19,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"time"
 
+	"github.com/golang/protobuf/ptypes"
 	"github.com/spf13/cobra"
 
+	"vitess.io/vitess/go/vt/log"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+	"vitess.io/vitess/go/vt/topo/topoproto"
 )
 
 var (
@@ -44,6 +48,11 @@ var (
 		Args:    cobra.NoArgs,
 		RunE:    commandGetKeyspaces,
 	}
+	initShardPrimaryCmd = &cobra.Command{
+		Use:  "InitShardPrimary",
+		Args: cobra.ExactArgs(2),
+		RunE: commandInitShardPrimary,
+	}
 )
 
 func commandFindAllShardsInKeyspace(cmd *cobra.Command, args []string) error {
@@ -91,8 +100,43 @@ func commandGetKeyspaces(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+var initShardPrimaryArgs = struct {
+	WaitReplicasTimeout time.Duration
+	Force               bool
+}{}
+
+func commandInitShardPrimary(cmd *cobra.Command, args []string) error {
+	keyspace, shard, err := topoproto.ParseKeyspaceShard(cmd.Flags().Arg(0))
+	if err != nil {
+		return err
+	}
+
+	tabletAlias, err := topoproto.ParseTabletAlias(cmd.Flags().Arg(1))
+	if err != nil {
+		return err
+	}
+
+	resp, err := client.InitShardPrimary(commandCtx, &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                keyspace,
+		Shard:                   shard,
+		PrimaryElectTabletAlias: tabletAlias,
+		WaitReplicasTimeout:     ptypes.DurationProto(initShardPrimaryArgs.WaitReplicasTimeout),
+		Force:                   initShardPrimaryArgs.Force,
+	})
+
+	for _, event := range resp.Events {
+		log.Infof("%v", event)
+	}
+
+	return err
+}
+
 func init() {
 	rootCmd.AddCommand(findAllShardsInKeyspaceCmd)
 	rootCmd.AddCommand(getKeyspaceCmd)
 	rootCmd.AddCommand(getKeyspacesCmd)
+
+	initShardPrimaryCmd.Flags().DurationVar(&initShardPrimaryArgs.WaitReplicasTimeout, "wait-replicas-timeout", 30*time.Second, "time to wait for replicas to catch up in reparenting")
+	initShardPrimaryCmd.Flags().BoolVar(&initShardPrimaryArgs.Force, "force", false, "will force the reparent even if the provided tablet is not a master or the shard master")
+	rootCmd.AddCommand(initShardPrimaryCmd)
 }