Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: remove 2.0 StatusNotFound version check

Browse Source
This commit is contained in:
Anthony Romano 2017-04-18 20:22:08 -07:00
parent 8fa4b8da6e
commit 3d8e2e1171
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etcdserver/cluster_util.go
View File

@ -23,7 +23,6 @@ import (
"time" "time"
"github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/pkg/httputil"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/version" "github.com/coreos/etcd/version"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
@ -241,15 +240,6 @@ func getVersion(m *membership.Member, rt http.RoundTripper) (*version.Versions,
plog.Warningf("failed to reach the peerURL(%s) of member %s (%v)", u, m.ID, err) plog.Warningf("failed to reach the peerURL(%s) of member %s (%v)", u, m.ID, err)
continue continue
} }
// etcd 2.0 does not have version endpoint on peer url.
if resp.StatusCode == http.StatusNotFound {
httputil.GracefulClose(resp)
return &version.Versions{
Server: "2.0.0",
Cluster: "2.0.0",
}, nil
}
var b []byte var b []byte
b, err = ioutil.ReadAll(resp.Body) b, err = ioutil.ReadAll(resp.Body)
resp.Body.Close() resp.Body.Close()