pdctl: verify pd address

cmd/pd-ctl/main.go

@@ -99,12 +99,11 @@ func loop() {
 			}
 			continue
 		}
-
+		if line == "exit" {
+			os.Exit(0)
+		}
 		args := strings.Split(strings.TrimSpace(line), " ")
 		args = append(args, "-u", url)
-		usage, err := pdctl.Start(args)
-		if err != nil {
-			fmt.Println(usage)
-		}
+		pdctl.Start(args)
 	}
 }

pdctl/command/global.go

@@ -30,6 +30,9 @@ import (
 var (
 	pdClient   pd.Client
 	dailClient = &http.Client{}
+
+	pingPrifix     = "pd/ping"
+	errInvalidAddr = errors.New("Invalid pd address, Cannot get connect to it")
 )
 
 func doRequest(cmd *cobra.Command, prefix string, method string) (string, error) {
@@ -74,6 +77,10 @@ func InitPDClient(cmd *cobra.Command) error {
 	if pdClient != nil {
 		return nil
 	}
+	err = validPDAddr(addr)
+	if err != nil {
+		return err
+	}
 	pdClient, err = pd.NewClient([]string{addr})
 	if err != nil {
 		return err
@@ -111,6 +118,27 @@ func printResponseError(r *http.Response) {
 	io.Copy(os.Stdout, r.Body)
 }
 
+func validPDAddr(pd string) error {
+	u, err := url.Parse(pd)
+	if err != nil {
+		return err
+	}
+	if u.Scheme == "" {
+		u.Scheme = "http"
+	}
+	addr := u.String()
+	reps, err := http.Get(fmt.Sprintf("%s/%s", addr, pingPrifix))
+	if err != nil {
+		return err
+	}
+	defer reps.Body.Close()
+	if reps.StatusCode != http.StatusOK {
+		ioutil.ReadAll(reps.Body)
+		return errInvalidAddr
+	}
+	return nil
+}
+
 // UsageTemplate will used to generate a help information
 const UsageTemplate = `Usage:{{if .Runnable}}
   {{if .HasAvailableFlags}}{{appendIfNotPresent .UseLine ""}}{{else}}{{.UseLine}}{{end}}{{end}}{{if .HasAvailableSubCommands}}

pdctl/ctl.go

@@ -14,6 +14,9 @@
 package pdctl
 
 import (
+	"fmt"
+	"os"
+
 	"github.com/pingcap/pd/pdctl/command"
 	"github.com/spf13/cobra"
 )
@@ -44,14 +47,17 @@ func init() {
 }
 
 // Start run Command
-func Start(args []string) (string, error) {
+func Start(args []string) {
 	rootCmd.SetArgs(args)
 	rootCmd.SilenceErrors = true
 	rootCmd.ParseFlags(args)
-	command.InitPDClient(rootCmd)
+	err := command.InitPDClient(rootCmd)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 	rootCmd.SetUsageTemplate(command.UsageTemplate)
 	if err := rootCmd.Execute(); err != nil {
-		return rootCmd.UsageString(), err
+		fmt.Println(rootCmd.UsageString())
 	}
-	return "", nil
 }