mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move etcdserver/errors.go to sepatate package to avoid cyclic dependencies.

Browse Source
This commit is contained in:
Piotr Tabor
2022-05-13 13:34:23 +02:00
parent e2ae9b1d13
commit fc6a6c3c27
17 changed files with 125 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/etcdserver/cluster_util.go
View File

@ -28,6 +28,7 @@ import (
"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/etcdserver/etcderrors"
"github.com/coreos/go-semver/semver"
"go.uber.org/zap"
@ -304,12 +305,12 @@ func promoteMemberHTTP(ctx context.Context, url string, id uint64, peerRt http.R
}
if resp.StatusCode == http.StatusRequestTimeout {
return nil, ErrTimeout
return nil, etcderrors.ErrTimeout
}
if resp.StatusCode == http.StatusPreconditionFailed {
// both ErrMemberNotLearner and ErrLearnerNotReady have same http status code
if strings.Contains(string(b), ErrLearnerNotReady.Error()) {
return nil, ErrLearnerNotReady
if strings.Contains(string(b), etcderrors.ErrLearnerNotReady.Error()) {
return nil, etcderrors.ErrLearnerNotReady
}
if strings.Contains(string(b), membership.ErrMemberNotLearner.Error()) {
return nil, membership.ErrMemberNotLearner
@ -408,7 +409,7 @@ func convertToClusterVersion(v string) (*semver.Version, error) {
// allow input version format Major.Minor
ver, err = semver.NewVersion(v + ".0")
if err != nil {
return nil, ErrWrongDowngradeVersionFormat
return nil, etcderrors.ErrWrongDowngradeVersionFormat
}
}
// cluster version only keeps major.minor, remove patch version