Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-3.6] Fix the issue of etcdserver crashing on receiving REST watch stream requests #19522

Merged
merged 5 commits into from
Mar 4, 2025
Merged

[release-3.6] Fix the issue of etcdserver crashing on receiving REST watch stream requests #19522

merged 5 commits into from
Mar 4, 2025

Conversation

ahrtr
Copy link
Member

@ahrtr ahrtr commented Mar 4, 2025

Backport #19521 to 3.6

cc @ivanvc @fuweid @serathius @spzala

ahrtr added 3 commits March 4, 2025 19:58
@ahrtr
Create an e2e test to reproduce the issue of etcdserver crashing on r…
a6660be 
…eceiving watch request

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@ahrtr
Bump grpc-gateway/v2 to v2.26.3
d2116e8 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@ahrtr
re-generate api/etcdserverpb/gw/rpc.pb.gw.go
325fd87 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@ahrtr
ensure the version consistent of google.golang.org/genproto/googleapi…
8fd8f80 
…s/rpc

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@codecov Codecov
Copy link

codecov bot commented Mar 4, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.84%. Comparing base (3219487) to head (84fefb1).
Report is 6 commits behind head on release-3.6.

Additional details and impacted files

see 26 files with indirect coverage changes

@@               Coverage Diff               @@
##           release-3.6   #19522      +/-   ##
===============================================
- Coverage        68.92%   68.84%   -0.08%     
===============================================
  Files              420      420              
  Lines            35788    35788              
===============================================
- Hits             24667    24640      -27     
- Misses            9696     9717      +21     
- Partials          1425     1431       +6

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3219487...84fefb1. Read the comment docs.

@ahrtr
ensure the version of golang.org/x/net consistent
84fefb1 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
spzala
spzala approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ahrtr !!

ivanvc
ivanvc approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks, @ahrtr.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, fuweid, ivanvc, spzala

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ahrtr ahrtr merged commit 6f02e59 into etcd-io:release-3.6 Mar 4, 2025
39 checks passed
@ahrtr ahrtr deleted the 3.6_curl_watch_20250304 branch March 4, 2025 21:25
@ivanvc ivanvc mentioned this pull request Mar 4, 2025
Closed
4 tasks
@ivanvc
Copy link
Member

ivanvc commented Mar 4, 2025

/retitle [release-3.6] Fix the issue of etcdserver crashing on receiving REST watch stream requests

@k8s-ci-robot k8s-ci-robot changed the title [3.6] Fix the issue of etcdserver crashing on receiving REST watch stream requests [release-3.6] Fix the issue of etcdserver crashing on receiving REST watch stream requests Mar 4, 2025
ivanvc added a commit to ivanvc/etcd that referenced this pull request Mar 5, 2025
@ivanvc
Update CHANGELOGs with recent merged pull requests
f51cc33 
Include notes from:

v3.4:
- etcd-io#19529

v3.5:
- etcd-io#19528
- etcd-io#19530

v3.6:
- etcd-io#19495
- etcd-io#19527
- etcd-io#19531
- etcd-io#19522

Signed-off-by: Ivan Valdes <ivan@vald.es>
This was referenced Mar 5, 2025
Merged
Closed
ivanvc added a commit to ivanvc/etcd that referenced this pull request Mar 5, 2025
@ivanvc
Update CHANGELOGs with recent merged pull requests
fa9233b 
Include notes from:

v3.4:
- etcd-io#19529
- etcd-io#19533

v3.5:
- etcd-io#19528
- etcd-io#19530

v3.6:
- etcd-io#19495
- etcd-io#19527
- etcd-io#19531
- etcd-io#19522

Signed-off-by: Ivan Valdes <ivan@vald.es>
Zanda256 pushed a commit to Zanda256/etcd that referenced this pull request Mar 7, 2025
@ivanvc @Zanda256
Update CHANGELOGs with recent merged pull requests
1b9ac4a 
Include notes from:

v3.4:
- etcd-io#19529
- etcd-io#19533

v3.5:
- etcd-io#19528
- etcd-io#19530

v3.6:
- etcd-io#19495
- etcd-io#19527
- etcd-io#19531
- etcd-io#19522

Signed-off-by: Ivan Valdes <ivan@vald.es>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivanvc ivanvc

@spzala spzala

@fuweid fuweid

Assignees
No one assigned
Labels
approved area/clientv3 area/etcdctl area/etcdutl area/testing area/tooling size/L
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ahrtr @k8s-ci-robot @ivanvc @spzala @fuweid