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.

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

Revert #13712 #13949

Merged
merged 3 commits into from Apr 19, 2022
Merged

Revert #13712 #13949

merged 3 commits into from Apr 19, 2022

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Apr 15, 2022

Reverts the PR #13712 and adds a unit test for correct handling of canonical SRV records.

xref #13948

/cc @serathius @spzala @ahrtr

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.

lgtm
@liggitt thanks so much for it and the discussion in the issue.
Also, re-running failed tests.
cc @serathius @ahrtr @ptabor

@codecov-commenter
Copy link

codecov-commenter commented Apr 18, 2022

Codecov Report

Merging #13949 (f07745a) into main (93c54b8) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main   #13949      +/-   ##
==========================================
- Coverage   72.49%   72.48%   -0.01%     
==========================================
  Files         469      469              
  Lines       38414    38413       -1     
==========================================
- Hits        27848    27844       -4     
- Misses       8777     8782       +5     
+ Partials     1789     1787       -2     
Flag Coverage Δ
all 72.48% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/proxy/grpcproxy/register.go 69.76% <0.00%> (-9.31%) ⬇️
client/v3/leasing/util.go 91.66% <0.00%> (-6.67%) ⬇️
raft/rafttest/node.go 95.00% <0.00%> (-5.00%) ⬇️
server/etcdserver/api/v3rpc/member.go 93.54% <0.00%> (-3.23%) ⬇️
server/etcdserver/api/v3election/election.go 66.66% <0.00%> (-2.78%) ⬇️
pkg/traceutil/trace.go 96.15% <0.00%> (-1.93%) ⬇️
server/storage/mvcc/kvstore_txn.go 75.27% <0.00%> (-1.10%) ⬇️
server/etcdserver/api/v3rpc/watch.go 85.90% <0.00%> (-0.68%) ⬇️
server/storage/mvcc/watchable_store.go 89.13% <0.00%> (-0.37%) ⬇️
server/etcdserver/server.go 84.54% <0.00%> (-0.33%) ⬇️
... and 13 more

Continue to review full report at Codecov.

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

@ahrtr
Copy link
Member

ahrtr commented Apr 18, 2022

Two comments:

  1. This PR needs to rebase, because I recently reverted the change which causes the pipeline failures, see 13945 ;
  2. Please hold on merging this PR until it's clearly clarified in 13948

@liggitt
Copy link
Contributor Author

liggitt commented Apr 18, 2022

rebased, and replied in #13948 (comment)

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

LGTM

Thank you.

Please refer to the discussion in issues/13948

@ptabor ptabor merged commit 03091b8 into etcd-io:main Apr 19, 2022
@serathius serathius mentioned this pull request Apr 19, 2022
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants