Merge pull request #5932 from heyitsanthony/nuke-etcdctl-v0.4

etcdctl: remove v0.4 support

etcdctl/ctlv2/command/import_snap_command.go

@@ -1,120 +0,0 @@
-// Copyright 2015 The etcd Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package command
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/store"
-	"github.com/urfave/cli"
-	"golang.org/x/net/context"
-)
-
-type set struct {
-	key   string
-	value string
-	ttl   int64
-}
-
-func NewImportSnapCommand() cli.Command {
-	return cli.Command{
-		Name:      "import",
-		Usage:     "import a snapshot to a cluster",
-		ArgsUsage: " ",
-		Flags: []cli.Flag{
-			cli.StringFlag{Name: "snap", Value: "", Usage: "Path to the valid etcd 0.4.x snapshot."},
-			cli.StringSliceFlag{Name: "hidden", Value: new(cli.StringSlice), Usage: "Hidden key spaces to import from snapshot"},
-			cli.IntFlag{Name: "c", Value: 10, Usage: "Number of concurrent clients to import the data"},
-		},
-		Action: handleImportSnap,
-	}
-}
-
-func handleImportSnap(c *cli.Context) error {
-	d, err := ioutil.ReadFile(c.String("snap"))
-	if err != nil {
-		if c.String("snap") == "" {
-			fmt.Printf("no snapshot file provided (use --snap)\n")
-		} else {
-			fmt.Printf("cannot read snapshot file %s\n", c.String("snap"))
-		}
-		os.Exit(1)
-	}
-
-	st := store.New()
-	err = st.Recovery(d)
-
-	wg := &sync.WaitGroup{}
-	setc := make(chan set)
-	concurrent := c.Int("c")
-	fmt.Printf("starting to import snapshot %s with %d clients\n", c.String("snap"), concurrent)
-	for i := 0; i < concurrent; i++ {
-		go runSet(mustNewKeyAPI(c), setc, wg)
-	}
-
-	all, err := st.Get("/", true, true)
-	if err != nil {
-		handleError(ExitServerError, err)
-	}
-	n := copyKeys(all.Node, setc)
-
-	hiddens := c.StringSlice("hidden")
-	for _, h := range hiddens {
-		allh, err := st.Get(h, true, true)
-		if err != nil {
-			handleError(ExitServerError, err)
-		}
-		n += copyKeys(allh.Node, setc)
-	}
-	close(setc)
-	wg.Wait()
-	fmt.Printf("finished importing %d keys\n", n)
-	return nil
-}
-
-func copyKeys(n *store.NodeExtern, setc chan set) int {
-	num := 0
-	if !n.Dir {
-		setc <- set{n.Key, *n.Value, n.TTL}
-		return 1
-	}
-	log.Println("entering dir:", n.Key)
-	for _, nn := range n.Nodes {
-		sub := copyKeys(nn, setc)
-		num += sub
-	}
-	return num
-}
-
-func runSet(ki client.KeysAPI, setc chan set, wg *sync.WaitGroup) {
-	for s := range setc {
-		log.Println("copying key:", s.key)
-		if s.ttl != 0 && s.ttl < 300 {
-			log.Printf("extending key %s's ttl to 300 seconds", s.key)
-			s.ttl = 5 * 60
-		}
-		_, err := ki.Set(context.TODO(), s.key, s.value, &client.SetOptions{TTL: time.Duration(s.ttl) * time.Second})
-		if err != nil {
-			log.Fatalf("failed to copy key: %v\n", err)
-		}
-	}
-	wg.Done()
-}

etcdctl/ctlv2/command/util.go

@@ -218,25 +218,9 @@ func mustNewClient(c *cli.Context) client.Client {
 				fmt.Fprintf(os.Stderr, "Try '--no-sync' if you want to access non-published client endpoints(%s).\n", strings.Join(hc.Endpoints(), ","))
 				handleError(ExitServerError, err)
 			}
-
 			if isConnectionError(err) {
 				handleError(ExitBadConnection, err)
 			}
-
-			// fail-back to try sync cluster with peer API. this is for making etcdctl work with etcd 0.4.x.
-			// TODO: remove this when we deprecate the support for etcd 0.4.
-			eps, serr := syncWithPeerAPI(c, ctx, hc.Endpoints())
-			if serr != nil {
-				if isConnectionError(serr) {
-					handleError(ExitBadConnection, serr)
-				} else {
-					handleError(ExitServerError, serr)
-				}
-			}
-			err = hc.SetEndpoints(eps)
-			if err != nil {
-				handleError(ExitServerError, err)
-			}
 		}
 		if debug {
 			fmt.Fprintf(os.Stderr, "got endpoints(%s) after sync\n", strings.Join(hc.Endpoints(), ","))
@@ -329,44 +313,3 @@ func newClient(c *cli.Context) (client.Client, error) {
 func contextWithTotalTimeout(c *cli.Context) (context.Context, context.CancelFunc) {
 	return context.WithTimeout(context.Background(), c.GlobalDuration("total-timeout"))
 }
-
-// syncWithPeerAPI syncs cluster with peer API defined at
-// https://github.com/coreos/etcd/blob/v0.4.9/server/server.go#L311.
-// This exists for backward compatibility with etcd 0.4.x.
-func syncWithPeerAPI(c *cli.Context, ctx context.Context, knownPeers []string) ([]string, error) {
-	tr, err := getTransport(c)
-	if err != nil {
-		return nil, err
-	}
-
-	var (
-		body []byte
-		resp *http.Response
-	)
-	for _, p := range knownPeers {
-		var req *http.Request
-		req, err = http.NewRequest("GET", p+"/v2/peers", nil)
-		if err != nil {
-			continue
-		}
-		resp, err = tr.RoundTrip(req)
-		if err != nil {
-			continue
-		}
-		if resp.StatusCode != http.StatusOK {
-			resp.Body.Close()
-			continue
-		}
-		body, err = ioutil.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err == nil {
-			break
-		}
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Parse the peers API format: https://github.com/coreos/etcd/blob/v0.4.9/server/server.go#L311
-	return strings.Split(string(body), ", "), nil
-}

etcdctl/ctlv2/ctl.go

@@ -65,7 +65,6 @@ func Start() {
 		command.NewWatchCommand(),
 		command.NewExecWatchCommand(),
 		command.NewMemberCommand(),
-		command.NewImportSnapCommand(),
 		command.NewUserCommands(),
 		command.NewRoleCommands(),
 		command.NewAuthCommands(),