[3.5] server: don't panic in readonly serializable txn #14178
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
|
PR isn't merged yet, but even if solution changes, I think test is relevant |
lavacat
force-pushed
the
release-3.5-txn-panic
branch
from
e874e60
to
ceda863
Compare
ahrtr
reviewed
Aug 13, 2022
server/etcdserver/apply.go
Outdated
| @@ -474,7 +475,17 @@ func (a *applierV3backend) Txn(ctx context.Context, rt *pb.TxnRequest) (*pb.TxnR | |||
| txn.End() | |||
| txn = a.s.KV().Write(trace) | |||
| } | |||
| a.applyTxn(ctx, txn, rt, txnPath, txnResp) | |||
| _, err := a.applyTxn(ctx, txn, rt, txnPath, txnResp) | |||
| if err != nil && isWrite { | |||
There was a problem hiding this comment.
Suggested change
| if err != nil && isWrite { | |
| if err != nil { |
|
Please update this PR per #14149 |
ptabor
suggested changes
Aug 29, 2022
|
Sorry about delay. Will update soon. |
lavacat
force-pushed
the
release-3.5-txn-panic
branch
from
ceda863
to
8ce41b2
Compare
Problem: We pass grpc context down to applier in readonly serializable txn. This context can be cancelled for example due to timeout. This will trigger panic inside applyTxn Solution: Only panic for transactions with write operations fixes etcd-io#14110 main PR etcd-io#14149 Signed-off-by: Bogdan Kanivets <bkanivets@apple.com>
lavacat
force-pushed
the
release-3.5-txn-panic
branch
from
8ce41b2
to
204d883
Compare
|
This is just a backport PR, so merging... Please add a changelog item if you haven't done it. @lavacat |
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.
Problem: We pass grpc context down to applier in readonly serializable txn.
This context can be cancelled for example due to timeout.
This will trigger panic inside applyTxn
Solution: Only panic for transactions with write operations
fixes #14110
backported from main #14149
Signed-off-by: Bogdan Kanivets bkanivets@apple.com
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.