etcdserver: allow to update attributes of removed member #2939
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
| @@ -319,7 +319,13 @@ func (c *cluster) RemoveMember(id types.ID) { | |||
| func (c *cluster) UpdateAttributes(id types.ID, attr Attributes) { | |||
| c.Lock() | |||
| defer c.Unlock() | |||
| c.members[id].Attributes = attr | |||
| if m, ok := c.members[id]; ok { | |||
There was a problem hiding this comment.
if m, ok := c.members[id]; ok {
m.Attributes = attr
return
}
_, ok := c.removed[id]
if ok {
...
} else {
...
}
|
LGTM |
yichengq
force-pushed
the
fix-update-attr
branch
2 times, most recently
from
4ab3cb0
to
46ebcff
Compare
|
It would be great if we can add a test case for it in integration test. |
yichengq
force-pushed
the
fix-update-attr
branch
2 times, most recently
from
7484df5
to
31494a5
Compare
|
unit test and integration test added. |
| @@ -270,6 +270,33 @@ func TestIssue2746(t *testing.T) { | |||
| clusterMustProgress(t, c.Members) | |||
| } | |||
|
|
|||
| // Ensure etcd can update attribute of removed member | |||
There was a problem hiding this comment.
Ensure etcd will not panic when removing a just started member.
yichengq
force-pushed
the
fix-update-attr
branch
from
31494a5
to
c84e378
Compare
|
rebased and improved comment in integration test. :) |
| ma := client.NewMembersAPI(cc) | ||
| ctx, cancel := context.WithTimeout(context.Background(), requestTimeout) | ||
| // the proposal is not committed because member 1 is stopped, but the | ||
| // proposal is written to leader's raft log. |
|
LGTM |
yichengq
force-pushed
the
fix-update-attr
branch
from
c84e378
to
8725e69
Compare
There exist the possiblity to update attributes of removed member in reasonable workflow: 1. start member A 2. leader receives the proposal to remove member A 2. member A sends the proposal of update its attribute to the leader 3. leader commits the two proposals So etcdserver should allow to update attributes of removed member.
yichengq
added a commit
that referenced
this pull request
Jun 10, 2015
etcdserver: allow to update attributes of removed member
|
I believe I am seeing this issue on 2.0.13. Will this fix be back-ported ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There exist the possiblity to update attributes of removed member in
reasonable workflow:
So etcdserver should allow to update attributes of removed member.
fixes case 1 and 3 of #2904
I have manually tested that the patch works.
@spacejam Could you double-check that it works?