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

telemetry: fix the bug about unnecessary error when run tidb only #25264

Merged
merged 41 commits into from
Jun 18, 2021
Merged

telemetry: fix the bug about unnecessary error when run tidb only #25264

merged 41 commits into from
Jun 18, 2021

Conversation

YinWeiling
Copy link
Contributor

What problem does this PR solve?

Problem Summary:

What is changed and how it works?

What's Changed:

fix the bug about unnecessary error when run tidb only

How it Works:

Related changes

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

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    run tidb only and observe

Side effects

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

Release note

  • fix the bug about unnecessary error when run tidb only

YinWeiling and others added 30 commits May 21, 2021 15:31
@YinWeiling
change PreviewUsageData func to show status when telemetry is disabled
8301db3
@YinWeiling
change PreviewUsageData func to show telemetry status when telemetry …
9bc483a 
…is disabled
@YinWeiling
Merge remote-tracking branch 'upstream/master' into addSQL_3.1
bf5ac5d
@YinWeiling
add SQL_3.1.1&3.1.3
1c33393
@YinWeiling
fix error check
0bd357c
@YinWeiling
undo report telemetry erroe in status when it is disabled
788f958
@YinWeiling
fix promQL in inforschema.metric_table_Def
94d2c1d
@YinWeiling
add SQL stastics & debug
9177178
@YinWeiling
fix format
2f434e0
@YinWeiling
fix commet in metrics_table_def.go
d5e855f
@YinWeiling
fix var names
4eda3a8
@YinWeiling
delete emoty line
0b04c70
@YinWeiling
use map to avoid sql type modify
0c8091b
@YinWeiling
use map to suit sql type modify
18bfeed
@kaixu120811
Merge branch 'master' into addSQL_3.1
28ebedb
@YinWeiling
remove unnecessary qurey in metrics_table_def
9c43561
@YinWeiling
modified: infoschema/metric_table_def.go
020ff3a
@YinWeiling
remove unnecessary code in infoschema/metric_table_def.go
5274e23
@kaixu120811
Merge branch 'master' into addSQL_3.1
6771a98
@YinWeiling
fix some func names in telemetry/data_window.go
a7f935a
@YinWeiling
modified: telemetry/data_window.go & infoschema/metric_table_def.go
e5e6479
@YinWeiling
modified: telemetry/data_window.go
b9c9733
@YinWeiling
Merge remote-tracking branch 'origin/addSQL_3.1' into addSQL_3.1
855f979
@YinWeiling
Merge branch 'master' into addSQL_3.1
9ff0eaf
@YinWeiling
Merge branch 'master' into addSQL_3.1
22130af
@kaixu120811
Slow query statistic share the same interface to query prom.
b935551
@kaixu120811
Merge branch 'master' into addSQL_3.1
0408409
@kaixu120811
Merge branch 'master' into addSQL_3.1
0bf7ddb
@YinWeiling
Merge branch 'master' into addSQL_3.1
fbb4e35
@kaixu120811
Merge branch 'master' into addSQL_3.1
a29ae97
@lucklove
Copy link
Member

/label sig/tiup

@ti-chi-bot
Copy link
Member

@lucklove: The label(s) sig/tiup cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0, needs-cherry-pick-5.1, proposal, release-note, require-LGT3, security, tools.

In response to this:

/label sig/tiup

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.

@lucklove
Copy link
Member

/sig tiup

@ti-chi-bot
Copy link
Member

@lucklove: The label(s) sig/tiup cannot be applied, because the repository doesn't have them.

In response to this:

/sig tiup

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.

@kaixu120811
Copy link
Collaborator

/LGTM

@ti-chi-bot
Copy link
Member

@kaixu120811: Please use GitHub review feature instead of /lgtm [cancel] when you want to submit review to the pull request.
For how to use GitHub review feature, see also this document provided by GitHub.

For the reason we drop support to the commands, see also this page.
This reply is being used as a temporary reply during the migration of review process and will be removed on July 1st.

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.

kaixu120811
kaixu120811 approved these changes Jun 18, 2021
View reviewed changes
Copy link
Collaborator

@kaixu120811 kaixu120811 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

@kaixu120811: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • breeswish
  • wjhuang2016

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.

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 18, 2021
@breezewish
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

@breeswish: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@lzmhhh123
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@lzmhhh123: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@lzmhhh123
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0e51620

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 18, 2021
@ti-chi-bot ti-chi-bot merged commit 1314b08 into pingcap:master Jun 18, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 18, 2021
@YinWeiling @ti-srebot
cherry pick pingcap#25264 to release-5.1
61d61c3 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jun 18, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #25555

Yisaer pushed a commit to Yisaer/tidb that referenced this pull request Jun 18, 2021
@YinWeiling @Yisaer
telemetry: fix the bug about unnecessary error when run tidb only (pi…
c97525e 
…ngcap#25264)
ti-chi-bot pushed a commit that referenced this pull request Jun 29, 2021
@ti-srebot
telemetry: fix the bug about unnecessary error when run tidb only (#2…
5b08e4c 
…5264) (#25555)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiongjiwei xiongjiwei xiongjiwei left review comments

@kaixu120811 kaixu120811 kaixu120811 approved these changes

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@breezewish breezewish breezewish approved these changes

@gregwebs gregwebs Awaiting requested review from gregwebs

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.1 size/S Denotes a PR that changes 10-29 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.
10 participants
@YinWeiling @lucklove @ti-chi-bot @kaixu120811 @breezewish @lzmhhh123 @ti-srebot @wjhuang2016 @xiongjiwei @Rustin170506