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

etcdserver: fix incorrect metrics generated when clients cancel watches #12803

Merged
merged 1 commit into from
Apr 1, 2021
Merged

etcdserver: fix incorrect metrics generated when clients cancel watches #12803

merged 1 commit into from
Apr 1, 2021

Conversation

cwedgwood
Copy link
Contributor

Manual cherry-pick of 9571325 for
release-3.4.

@cwedgwood
Copy link
Contributor Author

@ironcladlou @gyuho fyi & any thoughts or changes needed?

Travis' seems ok for 1 CPU and 4 so I think the 2 CPU failure is a glitch?

@cwedgwood cwedgwood closed this Mar 29, 2021
@cwedgwood cwedgwood reopened this Mar 29, 2021
@gyuho
Copy link
Contributor

gyuho commented Mar 29, 2021

Could you update our CHANGELOG as well (can be a separate PR)

@cwedgwood
Copy link
Contributor Author

cwedgwood commented Mar 29, 2021 •
edited
Loading

{updated]

@gyuho I see CHANGELOG-* aren't in this branch. I can update the one in master certainly.

Is it also useful to "backport" the CHANGELOG-*.md files from master into this release branch?

@cwedgwood
Copy link
Contributor Author

@gyuho #12817 perhaps suffices?

@cwedgwood
Copy link
Contributor Author

@ptabor @gyuho ping?
The other PS which updated the CHANGELOG merged but this is Approved but not merged yet. That leaves things inconsistent.

hexfusion
hexfusion suggested changes Mar 31, 2021
View reviewed changes
Copy link
Contributor

@hexfusion hexfusion left a comment

Choose a reason for hiding this comment

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

@cwedgwood please drop c499d9b integration: relax leader timeout from 3s to 4s … and we can get this merged if you want to backport that change please do so with a subsequent PR. Thanks!

@cwedgwood cwedgwood requested a review from hexfusion April 1, 2021 06:00
@cwedgwood
Copy link
Contributor Author

@cwedgwood please drop c499d9b integration: relax leader timeout from 3s to 4s … and we can get this merged if you want to backport that change please do so with a subsequent PR. Thanks!

@hexfusion ; That change already merged. I rebased without it all the same. PTAL.

hexfusion
hexfusion approved these changes Apr 1, 2021
View reviewed changes
Copy link
Contributor

@hexfusion hexfusion 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 @cwedgwood !

@hexfusion hexfusion merged commit 82eae92 into etcd-io:release-3.4 Apr 1, 2021
@hexfusion
Copy link
Contributor

@hexfusion ; That change already merged. I rebased without it all the same. PTAL.

I see, missed that..

@hexfusion hexfusion mentioned this pull request Jun 18, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ptabor ptabor ptabor approved these changes

@hexfusion hexfusion hexfusion approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cwedgwood @gyuho @hexfusion @ptabor