Compitable with different TiDB versions for conprof and non-root-login features #1047

baurine · 2021-11-04T11:34:36Z

What did:

Move conprof codes out of profiling
Check whether conprof and nonrootlogin features are supported in the current version
Make frontend adjustment for frontend when feature is not enabled

Screenshots:

Hide "Continuous Profiling" menu if it is not enabled

ti-chi-bot · 2021-11-04T11:34:37Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

shhdgit

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.

…t_tidb_versions

baurine · 2021-11-05T07:23:18Z

The CI says build frontend failed and need to run yarn fmt, I did it and it changed much code, a little strange why this happen, will check it later.

ui/lib/client/translations/zh.yaml

breezewish

@shhdgit PTAL

pkg/apiserver/info/info.go

breezewish · 2021-11-05T07:46:52Z

The CI says build frontend failed and need to run yarn fmt, I did it and it changed much code, a little strange why this happen, will check it later.

prettier version has been updated in c33af34 you can run yarn to update your local prettier. Then you should get the same format results as in CI.

baurine · 2021-11-06T04:50:15Z

pkg/config/config.go

@@ -38,7 +38,7 @@ type Config struct {

 	EnableTelemetry    bool
 	EnableExperimental bool
-	EnableNonRootLogin bool


After removing this config item, the code in the PD side (PR: https://github.com/tikv/pd/pull/4141/files) doesn't work anymore. So when we submit a new release to PD, we need to remove that line code in PD. Just a reminder.

pkg/apiserver/apiserver.go

shhdgit · 2021-11-07T12:36:51Z

pkg/apiserver/conprof/feature_enable.go

+	featureEnabled        *bool
+)
+
+func IsFeatureEnable(config *config.Config) (enabled bool) {


Considering that there are many features that require a feature flag, how about abstracting this into a util. e.g.

type FeatureFlag struct { supportedTiDBVersions []string enabled *bool } func (ff *FeatureFlag) IsEnable(targetVersion string) bool func (ff *FeatureFlag) Middleware(targetVersion string) gin.HandlerFunc

And we can declare feature flags in module.go/mod.go(in the future)

var FeatureFlag = util.NewFeatureFlag([]string{">= 5.3.0"}) var Module = fx...

LGTM, and I will do this refinement in #1035 later.

…t_tidb_versions

baurine · 2021-11-08T09:52:30Z

All comments are addressed, PTAL, thanks! @breeswish @shhdgit

…n features (pingcap#1047) * make conprof independent * check feature enable * add check feature enable middleware * hide menu if feature is not enabled * refactor non root login switch by new design * i18n * yarn fmt * renaming * adjust fe code * refine * remove unused log

* Revert "Release v2021.12.06.1 (#1084)" This reverts commit bcc43a0. * Compitable with different TiDB versions for conprof and non-root-login features (#1047) * make conprof independent * check feature enable * add check feature enable middleware * hide menu if feature is not enabled * refactor non root login switch by new design * i18n * yarn fmt * renaming * adjust fe code * refine * remove unused log * build(deps): bump ws from 5.2.2 to 5.2.3 in /ui (#1055) * CICD: Update the release pipeline for recent PD format policies (#1054) * fix i18n wording (#1056) * Refactor: Change util module to util package (#1052) * Refactor: Fix godot incorrectly add dot suffix to annotations (#1059) * lint: Add goheader for copyright lints (#1062) * Refactor: Migrate to use the `rest` package in util/ (#1060) * fix(*): globally delete/update data by GORM (#1065) * ui: bump dependencies (#1066) * refactor: Switch to use ziputil, netutil, reflectutil and fileswap (#1067) * Fix request header being pinned after pd profiling (#1069) * Integrate speedscope (#1064) * fix potential panic when GetPDInstances (#1075) Signed-off-by: crazycs <chen.two.cs@gmail.com> * Refactor: a new httpclient (#1073) * Refactor: Switch to use util/distro in all places (#1078) * chore: support import relative file URL (#1082) * Refactor: Move tools into a standalone module (#1079) * Fix script to embed the ui (#1088) * Fix script to embed the ui * Hack write_strings * Refactor feature flag to support more modules (#1057) * Drop sysutil dependency (#1093) * chore: add graph generation (#1085) * Refactor: Add TopologyProvider (#1098) * esbuild: i18n + dep (#1101) * script: Add a script to generate version matrix (#1104) * distro: support dynamic config (#1094) * chore: support multiple profiling types (#1095) * fix(distro): check distro_strings.json fmt by prettier (#1106) * script: fix generate assets (#1107) * Add integration test (#1083) * debug_api: Switch to use the new util (#1103) * refactor(ui): auto refresh button (#1105) * refactor(ui): auto refresh button * chore: update translation * fix: remain seconds * refine: refresh button * fix: onRefresh * fix: auto refresh * fix: continue tick * chore: add some comments * tweak: remaining refresh seconds * chore: clean code Co-authored-by: Wenxuan <breezewish@pingcap.com> * ui: refine conprof (#1102) * update wording * not check prom any more * replace time range component * i18n * support view profile by diffrent ways * extract ActionsButton * change download data format * refine * comments * Revert "comments" This reverts commit 3b03fdb. * fix view cpu profile fail * update state * hide action button if disable * address feedback * update release-version * sync with master Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wenxuan <breezewish@pingcap.com> Co-authored-by: Suhaha <jklopsdfw@gmail.com> Co-authored-by: Yini Xu <34967660+YiniXu9506@users.noreply.github.com> Co-authored-by: crazycs <crazycs520@gmail.com>

baurine added 4 commits November 4, 2021 17:50

make conprof independent

f5784ea

check feature enable

af311ed

add check feature enable middleware

6a2471b

hide menu if feature is not enabled

9769a89

baurine marked this pull request as draft November 4, 2021 11:34

baurine added 3 commits November 5, 2021 13:08

refactor non root login switch by new design

ed041f4

Merge remote-tracking branch 'origin/master' into compitable_differen…

7b4f996

…t_tidb_versions

i18n

f7dbc5e

baurine marked this pull request as ready for review November 5, 2021 07:20

baurine requested review from breezewish and shhdgit November 5, 2021 07:21

baurine changed the title ~~[WIP] Compitable different TiDB versions~~ Compitable different TiDB versions Nov 5, 2021

baurine changed the title ~~Compitable different TiDB versions~~ Compitable with different TiDB versions for conprof and non-root-login features Nov 5, 2021

breezewish reviewed Nov 5, 2021

View reviewed changes

ui/lib/client/translations/zh.yaml Outdated Show resolved Hide resolved

breezewish reviewed Nov 5, 2021

View reviewed changes

pkg/apiserver/info/info.go Outdated Show resolved Hide resolved

baurine commented Nov 6, 2021

View reviewed changes

ti-chi-bot added the needs-rebase label Nov 6, 2021

shhdgit reviewed Nov 7, 2021

View reviewed changes

baurine added 2 commits November 8, 2021 13:55

Merge remote-tracking branch 'origin/master' into compitable_differen…

df86de2

…t_tidb_versions

yarn fmt

eb4de3e

ti-chi-bot removed the needs-rebase label Nov 8, 2021

baurine added 4 commits November 8, 2021 16:42

renaming

df49d91

adjust fe code

0fed662

refine

38fce1e

remove unused log

886199f

shhdgit approved these changes Nov 9, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 label Nov 9, 2021

baurine merged commit 17fba18 into pingcap:master Nov 10, 2021

baurine deleted the compitable_different_tidb_versions branch November 10, 2021 03:18

shhdgit mentioned this pull request Nov 11, 2021

Refactor feature flag to support more modules #1057

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Compitable with different TiDB versions for conprof and non-root-login features #1047

Compitable with different TiDB versions for conprof and non-root-login features #1047

baurine commented Nov 4, 2021 •

edited

ti-chi-bot commented Nov 4, 2021 •

edited

baurine commented Nov 5, 2021

breezewish left a comment

breezewish commented Nov 5, 2021

baurine Nov 6, 2021

shhdgit Nov 7, 2021 •

edited

shhdgit Nov 8, 2021 •

edited

baurine commented Nov 8, 2021

Compitable with different TiDB versions for conprof and non-root-login features #1047

Compitable with different TiDB versions for conprof and non-root-login features #1047

Conversation

baurine commented Nov 4, 2021 • edited

ti-chi-bot commented Nov 4, 2021 • edited

baurine commented Nov 5, 2021

breezewish left a comment

Choose a reason for hiding this comment

breezewish commented Nov 5, 2021

baurine Nov 6, 2021

Choose a reason for hiding this comment

shhdgit Nov 7, 2021 • edited

Choose a reason for hiding this comment

shhdgit Nov 8, 2021 • edited

Choose a reason for hiding this comment

baurine commented Nov 8, 2021

baurine commented Nov 4, 2021 •

edited

ti-chi-bot commented Nov 4, 2021 •

edited

shhdgit Nov 7, 2021 •

edited

shhdgit Nov 8, 2021 •

edited