From e1e2daa205ceed8c2476152cdea90df3b546227c Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Fri, 27 Mar 2015 16:09:04 -0700
Subject: [PATCH] Revert "etcd: register usable versions when bootstrap"

This reverts commit 9f70568a02bc63d53f558789dca7176db802d0ac.
---
 etcd/etcd.go    |  1 -
 etcd/upgrade.go | 59 -------------------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 etcd/upgrade.go

diff --git a/etcd/etcd.go b/etcd/etcd.go
index 20c9122c5..b23fa3db5 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -309,7 +309,6 @@ func (e *Etcd) runServer() {
 	for {
 		if e.mode == PeerMode {
 			log.Infof("%v starting in peer mode", e.Config.Name)
-			go registerAvailableInternalVersions(e.Config.Name, e.Config.Addr, e.Config.EtcdTLSInfo())
 			// Starting peer server should be followed close by listening on its port
 			// If not, it may leave many requests unaccepted, or cannot receive heartbeat from the cluster.
 			// One severe problem caused if failing receiving heartbeats is when the second node joins one-node cluster,
diff --git a/etcd/upgrade.go b/etcd/upgrade.go
deleted file mode 100644
index 8cb2319be..000000000
--- a/etcd/upgrade.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package etcd
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"time"
-
-	"github.com/coreos/etcd/log"
-	"github.com/coreos/etcd/server"
-	"github.com/coreos/etcd/third_party/github.com/coreos/go-etcd/etcd"
-)
-
-var defaultEtcdBinaryDir = "/usr/libexec/etcd/internal_versions/"
-
-func registerAvailableInternalVersions(name string, addr string, tls *server.TLSInfo) {
-	var c *etcd.Client
-	if tls.Scheme() == "http" {
-		c = etcd.NewClient([]string{addr})
-	} else {
-		var err error
-		c, err = etcd.NewTLSClient([]string{addr}, tls.CertFile, tls.KeyFile, tls.CAFile)
-		if err != nil {
-			log.Fatalf("client TLS error: %v", err)
-		}
-	}
-
-	vers, err := getInternalVersions()
-	if err != nil {
-		log.Infof("failed to get local etcd versions: %v", err)
-		return
-	}
-	for _, v := range vers {
-		for {
-			_, err := c.Set("/_etcd/available-internal-versions/"+v+"/"+name, "ok", 0)
-			if err == nil {
-				break
-			}
-			time.Sleep(time.Second)
-		}
-	}
-	log.Infof("%s: available_internal_versions %s is registered into key space successfully.", name, vers)
-}
-
-func getInternalVersions() ([]string, error) {
-	if runtime.GOOS != "linux" {
-		return nil, fmt.Errorf("unmatched os version %v", runtime.GOOS)
-	}
-	etcdBinaryDir := os.Getenv("ETCD_BINARY_DIR")
-	if etcdBinaryDir == "" {
-		etcdBinaryDir = defaultEtcdBinaryDir
-	}
-	dir, err := os.Open(etcdBinaryDir)
-	if err != nil {
-		return nil, err
-	}
-	defer dir.Close()
-	return dir.Readdirnames(-1)
-}