Skip to content

server: fix the bug that metrics data returns twice#12671

Merged
ti-chi-bot merged 9 commits intotikv:masterfrom
glorv:fix-metrics
May 30, 2022
Merged

server: fix the bug that metrics data returns twice#12671
ti-chi-bot merged 9 commits intotikv:masterfrom
glorv:fix-metrics

Conversation

@glorv
Copy link
Contributor

@glorv glorv commented May 27, 2022 •
edited
Loading

What is changed and how it works?

Issue Number: Close #12670

What's Changed:

Fix the bug that metrics data returned twice which is introduced in #12602

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note 

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 27, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • 5kbpers

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/needs-triage-completed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 27, 2022
@glorv
fix the bug that metrics data returns twice
9d20bb2 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 27, 2022
@glorv glorv requested review from 5kbpers and Connor1996 May 27, 2022 03:09
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 27, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 27, 2022
@5kbpers
Copy link
Member

5kbpers commented May 27, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 27, 2022

@5kbpers: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 27, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 222e715

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 27, 2022
@glorv
Copy link
Contributor Author

glorv commented May 27, 2022

/build

@glorv
Copy link
Contributor Author

glorv commented May 27, 2022

/test

zhangjinpeng87
zhangjinpeng87 reviewed May 27, 2022
View reviewed changes
components/tikv_util/src/metrics/mod.rs
if let Err(e) = encoder.encode(&*metric_families, w) {
warn!("prometheus encoding error"; "err" => ?e);
}
return;
Copy link
Member

@zhangjinpeng87 zhangjinpeng87 May 27, 2022

Choose a reason for hiding this comment

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

Please add test case to cover this code path.

Copy link
Contributor Author

@glorv glorv May 28, 2022

Choose a reason for hiding this comment

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

done

@glorv
Copy link
Contributor Author

glorv commented May 28, 2022

/test

@glorv
add a unit test
341de03 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed status/can-merge Indicates a PR has been approved by a committer. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 28, 2022
@glorv
fix lint
6822056 
Signed-off-by: glorv <glorvs@163.com>
@Connor1996
Copy link
Member

Connor1996 commented May 30, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022

@Connor1996: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 6822056

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2022
@glorv
Copy link
Contributor Author

glorv commented May 30, 2022

/test

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022

@glorv: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@glorv
fix test
05f6447 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2022
@glorv
fix
2b5915e 
Signed-off-by: glorv <glorvs@163.com>
@overvenus
Copy link
Member

overvenus commented May 30, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022

@overvenus: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 2b5915e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2022
@ti-chi-bot ti-chi-bot merged commit d0bc9d1 into tikv:master May 30, 2022
@glorv glorv deleted the fix-metrics branch May 30, 2022 10:51
glorv added a commit to ti-srebot/tikv that referenced this pull request Jun 20, 2022
@glorv @ti-chi-bot
server: fix the bug that metrics data returns twice (tikv#12671)
f62ad35 
ref tikv#12602, close tikv#12670

Signed-off-by: glorv <glorvs@163.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@glorv glorv mentioned this pull request Jun 20, 2022
Merged
glorv added a commit to glorv/tikv that referenced this pull request Jun 22, 2022
@glorv @ti-chi-bot
server: fix the bug that metrics data returns twice (tikv#12671)
68bdccc 
ref tikv#12602, close tikv#12670

Signed-off-by: glorv <glorvs@163.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@glorv glorv mentioned this pull request Jun 22, 2022
Merged
ti-chi-bot added a commit that referenced this pull request Jun 23, 2022
@glorv @ti-chi-bot
server: support return simplified metrics and gzip compression (#12880)
0dc4192 
ref #12355, ref #12356, ref #12417, ref #12671

Signed-off-by: glorv <glorvs@163.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhangjinpeng87 zhangjinpeng87 zhangjinpeng87 left review comments

@overvenus overvenus overvenus approved these changes

@5kbpers 5kbpers 5kbpers approved these changes

@Connor1996 Connor1996 Awaiting requested review from Connor1996

+1 more reviewer

@3pointer 3pointer 3pointer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

tikv returns duplicated metrics result.

7 participants

@glorv @ti-chi-bot @5kbpers @Connor1996 @overvenus @3pointer @zhangjinpeng87