etcdserver: return membership.ErrIDNotFound when the memberID not found
#15095
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
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jan 13, 2023
Backport etcd-io#15095. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jan 13, 2023
Backport etcd-io#15095 to 3.4. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
This was referenced Jan 13, 2023
Codecov Report
@@ Coverage Diff @@
## main #15095 +/- ##
==========================================
- Coverage 74.72% 74.61% -0.12%
==========================================
Files 415 415
Lines 34340 34343 +3
==========================================
- Hits 25661 25624 -37
- Misses 7045 7077 +32
- Partials 1634 1642 +8
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
ptabor
reviewed
Jan 16, 2023
There was a problem hiding this comment.
Thank you. The logic seems better than it used to.
Still I'm not confident the code will work well if e.g. during waitAppliedIndex the leader changes]... It's likely rs.Progress will report NULL in such a situation.
Shell we fetch
waitAppliedIndex(...)
progress:=rs.Progress
if (progress == nil) ...
...
fir memberId, progress := range progress { ...
When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
ahrtr
force-pushed
the
promote_non_exist_id_20230113
branch
from
2398d57 to
8ed20e8
Compare
It seems not a problem. Even the leader changes during But actually it doesn't make sense to execute |
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jan 16, 2023
Backport etcd-io#15095. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
ahrtr
added a commit
to ahrtr/etcd
that referenced
this pull request
Jan 16, 2023
Backport etcd-io#15095 to 3.4. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
ptabor
approved these changes
Jan 16, 2023
|
thx @ptabor for the quick review. |
tjungblu
pushed a commit
to tjungblu/etcd
that referenced
this pull request
Jul 26, 2023
Backport etcd-io#15095. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
tjungblu
pushed a commit
to tjungblu/etcd
that referenced
this pull request
Jul 26, 2023
Backport etcd-io#15095. When promoting a learner, we need to wait until the leader's applied ID catches up to the commitId. Afterwards, check whether the learner ID exist or not, and return `membership.ErrIDNotFound` directly in the API if the member ID not found, to avoid the request being unnecessarily delivered to raft. Signed-off-by: Benjamin Wang <[email protected]>
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.
This PR should fix the failure in https://github.com/etcd-io/etcd/actions/runs/3908224614/jobs/6678181444
The existing test cases
TestMemberPromote*in cluster_test.go already covers the code path updated in this PR.Signed-off-by: Benjamin Wang [email protected]
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.