This repository has been archived by the owner on Mar 28, 2020. It is now read-only.
cluster: get name from PeerURL if member unready #568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hongchaodeng
force-pushed
the
r2
branch
3 times, most recently
from
c797e66
to
89a6d61
Compare
xiang90
reviewed
Jan 1, 2017
| @@ -19,4 +19,6 @@ import "errors" | |||
| var ( | |||
| errNoBackupExist = errors.New("no backup exist for disaster recovery") | |||
| errInvalidMemberName = errors.New("the format of member's name is invalid") | |||
|
|
|||
| errSelfHostedUnreadyMember = errors.New("self hosted shouldn't have any unready member. It has loop waited until member ready") | |||
There was a problem hiding this comment.
unexpected unready member for selfhosted cluster.
xiang90
reviewed
Jan 1, 2017
| @@ -19,4 +19,6 @@ import "errors" | |||
| var ( | |||
| errNoBackupExist = errors.New("no backup exist for disaster recovery") | |||
| errInvalidMemberName = errors.New("the format of member's name is invalid") | |||
|
|
|||
| errSelfHostedUnreadyMember = errors.New("self hosted shouldn't have any unready member. It has loop waited until member ready") | |||
There was a problem hiding this comment.
ErrUnexpectedUnreadyMember
xiang90
reviewed
Jan 1, 2017
| return errMemberNotReady | ||
| var name string | ||
| if c.cluster.Spec.SelfHosted != nil { | ||
| name = m.Name |
There was a problem hiding this comment.
We need to assign name in order figure out self hosted membership.
xiang90
reviewed
Jan 1, 2017
| @@ -54,3 +56,11 @@ func RemoveMember(clientURLs []string, id uint64) error { | |||
| cancel() | |||
| return err | |||
| } | |||
|
|
|||
| func NameFromPeerURL(pu string) (string, error) { | |||
xiang90
reviewed
Jan 1, 2017
| "github.com/coreos/etcd-operator/pkg/spec" | ||
| "github.com/coreos/etcd-operator/pkg/util/etcdutil" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| ) | ||
|
|
||
| var errMemberNotReady = errors.New("etcd member's Name is empty. It's not ready yet.") | ||
|
|
||
| func (c *Cluster) updateMembers(known etcdutil.MemberSet) error { | ||
| resp, err := etcdutil.ListMembers(known.ClientURLs()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| members := etcdutil.MemberSet{} |
There was a problem hiding this comment.
can we move line29 to line58 into etcdutil (from resp to memberSet)? and add a unit test for it?
hongchaodeng
force-pushed
the
r2
branch
2 times, most recently
from
1289338
to
84ae4cb
Compare
|
I figured the part in member.go line 29-59 isn't very easy to refactor out as a separate func into etcdutil due to some error handling. Additionally, we shouldn't bloat this PR more with error handling restructuring code. We should probably do it in another PR |
hongchaodeng
force-pushed
the
r2
branch
2 times, most recently
from
13227fb
to
53b0400
Compare
xiang90
reviewed
Jan 2, 2017
| import "testing" | ||
|
|
||
| func TestMemberNameFromPeerURL(t *testing.T) { | ||
| n := "test-cluster" |
There was a problem hiding this comment.
test both valid and invalid case.
|
@xiang90 tests added |
xiang90
reviewed
Jan 3, 2017
| continue | ||
| } | ||
| if err != nil { | ||
| t.Fatal(err) |
There was a problem hiding this comment.
t.errorf: want err = nil, got %v
|
lgtm |
Problem statement: We could fail in MemberAdd() due to context deadline exceeded and thus not creating related pod/service. But we could have added the member. Then we would end up infinitely looping on updateMembers() on "not ready member" error. One idea is that we can get name from member's PeerURL. For self hosted case, it's more complicated because it's host IP. We currently loop wait until the member has been added successfully. In the future we could use pod IP to match.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem statement: We could fail in MemberAdd() due to context deadline
exceeded and thus not creating related pod/service. But we could have
added the member. Then we would end up infinitely looping on updateMembers()
on "not ready member" error.
One idea is that we can get name from member's PeerURL.
For self hosted case, it's more complicated because it's host IP.
We currently loop wait until the member has been added successfully.
In the future we could use pod IP to match.