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

session: Do not run telemetry loops when it's disabled in config (#40156) #41150

Merged
merged 3 commits into from
Mar 30, 2023
Merged

session: Do not run telemetry loops when it's disabled in config (#40156) #41150

merged 3 commits into from
Mar 30, 2023

Conversation

sunxiaoguang
Copy link
Contributor

@sunxiaoguang sunxiaoguang commented Feb 7, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #40155

Problem Summary:

This is an automated cherry-pick of #40156

Telemetry can not be enabled by global variable when it's disabled in config file. Therefore we don't need to run telemetry related loops at all when telemetry is disabled from global config.

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

sunxiaoguang and others added 2 commits February 7, 2023 07:55
@sunxiaoguang @ti-chi-bot
This is an automated cherry-pick of #40156
d9b0e3f 
Signed-off-by: ti-chi-bot <[email protected]>
@sunxiaoguang
Fix conflict
532da3c 
Signed-off-by: Xiaoguang Sun <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 7, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • dveeden
  • mornyx

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 do-not-merge/invalid-title do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 7, 2023
@dveeden
Copy link
Contributor

dveeden commented Feb 7, 2023

Same as #41147 but with merge conflicts fixed.

dveeden
dveeden reviewed Feb 7, 2023
View reviewed changes
session/session.go Outdated
if config.GetGlobalConfig().EnableTelemetry {
// There is no way to turn telemetry on with global variable `tidb_enable_telemetry`
// when it is disabled in config. See IsTelemetryEnabled function in telemetry/telemetry.go
go func() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is adding go func() here like this not changing the behaviour? Is this ok for a bugfix release?

Copy link
Contributor Author

@sunxiaoguang sunxiaoguang Feb 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Hm, it shouldn't affect any feature but just make initialization synchronous and speed up startup when connecting to telemetry server is blocked by network policy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The reason to add go here was I realized that starting tidb-server takes about 20 seconds when the hosting environment doesn't have internet access.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But I think you are right. We should keep changes as small as possible for back port. I have reverted this according to the behavior in 6.1. PTAL

@sunxiaoguang sunxiaoguang changed the title Cherry pick 40156 to release 6.1 session: Do not run telemetry loops when it's disabled in config (#40156) Feb 7, 2023
@sunxiaoguang
Remove go
82b6dcf 
Signed-off-by: Xiaoguang Sun <[email protected]>
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 7, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 7, 2023
@sunxiaoguang
Copy link
Contributor Author

/retest

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved and removed do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. labels Mar 29, 2023
@sunxiaoguang sunxiaoguang reopened this Mar 30, 2023
@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 Mar 30, 2023
@jebter
Copy link

jebter commented Mar 30, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 82b6dcf

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 30, 2023
@jebter
Copy link

jebter commented Mar 30, 2023

/retest

@ti-chi-bot ti-chi-bot merged commit 0cd8c4c into pingcap:release-6.1 Mar 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mornyx mornyx mornyx approved these changes

@dveeden dveeden dveeden approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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.
6 participants
@sunxiaoguang @ti-chi-bot @dveeden @jebter @mornyx @VelocityLight