*: fix wrong result when to concurrency merge global stats #48852

hawkingrei · 2023-11-23T12:22:13Z

What problem does this PR solve?

Issue Number: close #48713

Problem Summary:

What changed and how does it work?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

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

Documentation

Release note

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

None

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

codecov · 2023-11-23T12:34:19Z

Codecov Report

Merging #48852 (82e612d) into master (522cd03) will increase coverage by 1.6155%.
Report is 1 commits behind head on master.
The diff coverage is 96.9697%.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #48852        +/-   ##
================================================
+ Coverage   71.0271%   72.6426%   +1.6155%     
================================================
  Files          1367       1391        +24     
  Lines        404903     411535      +6632     
================================================
+ Hits         287591     298950     +11359     
+ Misses        97306      93662      -3644     
+ Partials      20006      18923      -1083

Flag	Coverage Δ
integration	`43.6089% <12.1212%> (?)`
unit	`71.0031% <96.9697%> (-0.0240%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`53.9663% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`48.8141% <ø> (-4.2492%)`	⬇️

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

hawkingrei · 2023-11-24T01:14:52Z

pkg/statistics/handle/globalstats/merge_worker.go

-			worker.respCh <- resp
-			return
-		}
+
 		partNum := len(allTopNs)


BUG 1:

It should check all tops. but here is to check the part. it will create a bug.

hawkingrei · 2023-11-24T01:15:27Z

pkg/statistics/handle/globalstats/merge_worker.go

-				counter[encodedVal] += float64(val.Count)
+				worker.mu.Lock()
+				_, exists := worker.counter[encodedVal]
+				worker.counter[encodedVal] += float64(val.Count)
 				if exists {


BUG 2

it should merge the global counter. but it merge the counter in echo worker.

BUG 3

and it will create wrong result from BinarySearchRemoveVal. it will remove it second.

elsa0520 · 2023-11-24T01:47:18Z

pkg/sessionctx/variable/tidb_vars.go

@@ -1361,7 +1361,7 @@ const (
 	DefTiDBOptRangeMaxSize                       = 64 * int64(size.MB) // 64 MB
 	DefTiDBCostModelVer                          = 2
 	DefTiDBServerMemoryLimitSessMinSize          = 128 << 20
-	DefTiDBMergePartitionStatsConcurrency        = 1
+	DefTiDBMergePartitionStatsConcurrency        = 2


Add a todo comment to change it back 1 (This is a temp value just for test concurrency partition stats)

I have been reverted.

elsa0520

LGTM

ti-chi-bot · 2023-11-24T02:23:40Z

[LGTM Timeline notifier]

Timeline:

2023-11-24 01:51:18.823869846 +0000 UTC m=+541907.489096040: ☑️ agreed by elsa0520.
2023-11-24 02:23:38.946387218 +0000 UTC m=+543847.611613413: ☑️ agreed by AilinKid.

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

ti-chi-bot · 2023-11-24T02:56:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, elsa0520

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [AilinKid]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

hawkingrei · 2023-11-24T03:31:19Z

/retest

ti-chi-bot · 2023-11-24T03:54:26Z

In response to a cherrypick label: new pull request created to branch release-7.5: #48864.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

…48864) close #48713

…48852)" This reverts commit 26db590.

hawkingrei · 2024-02-19T07:39:15Z

/cherrypick release-7.1
/cherrypick release-6.5

ti-chi-bot · 2024-02-19T07:39:57Z

@hawkingrei: new pull request created to branch release-6.5: #51146.

In response to this:

/cherrypick release-7.1
/cherrypick release-6.5

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.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot · 2024-02-19T07:40:39Z

@hawkingrei: new pull request created to branch release-7.1: #51147.

In response to this:

/cherrypick release-7.1
/cherrypick release-6.5

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.

…51146) close #48713

…51147) close #48713

hawkingrei added 2 commits November 23, 2023 19:39

update

fa86ae8

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

statistics: fix the bug in the mergeGlobalStats

0541e65

ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked 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 Nov 23, 2023

statistics: fix the bug in the mergeGlobalStats

8dbef1e

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 23, 2023

hawkingrei added 4 commits November 23, 2023 22:13

statistics: fix the bug in the mergeGlobalStats

6a8cbc1

update

1d8e6f0

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

388fe10

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

6583952

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 23, 2023

hawkingrei force-pushed the fix_bug_for_cc branch from 12d133f to 63374c8 Compare November 23, 2023 17:27

hawkingrei force-pushed the fix_bug_for_cc branch from 2a6ca43 to 6583952 Compare November 24, 2023 00:15

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 24, 2023

tmp

7ea23f7

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 24, 2023

tmp

b6cade8

ti-chi-bot bot removed do-not-merge/needs-tests-checked do-not-merge/needs-linked-issue labels Nov 24, 2023

hawkingrei commented Nov 24, 2023

View reviewed changes

elsa0520 reviewed Nov 24, 2023

View reviewed changes

elsa0520 approved these changes Nov 24, 2023

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 24, 2023

AilinKid approved these changes Nov 24, 2023

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 24, 2023

update

82e612d

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

ti-chi-bot bot added the approved label Nov 24, 2023

ti-chi-bot bot merged commit 26db590 into pingcap:master Nov 24, 2023
16 checks passed

ti-chi-bot mentioned this pull request Nov 24, 2023

*: fix wrong result when to concurrency merge global stats (#48852) #48864

Merged

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 24, 2023

This is an automated cherry-pick of pingcap#48852

3663733

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot bot pushed a commit that referenced this pull request Nov 24, 2023

*: fix wrong result when to concurrency merge global stats (#48852) (#…

069631e

…48864) close #48713

hawkingrei deleted the fix_bug_for_cc branch November 28, 2023 10:03

hawkingrei added a commit that referenced this pull request Nov 28, 2023

Revert "*: fix wrong result when to concurrency merge global stats (#…

3bc942a

…48852)" This reverts commit 26db590.

hawkingrei mentioned this pull request Nov 28, 2023

Revert "*: fix wrong result when to concurrency merge global stats " for test #48967

Closed

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 19, 2024

This is an automated cherry-pick of pingcap#48852

1fa1f5e

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request Feb 19, 2024

*: fix wrong result when to concurrency merge global stats (#48852) #51146

Merged

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 19, 2024

This is an automated cherry-pick of pingcap#48852

c3e6206

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request Feb 19, 2024

*: fix wrong result when to concurrency merge global stats (#48852) #51147

Merged

13 tasks

ti-chi-bot bot pushed a commit that referenced this pull request Feb 19, 2024

*: fix wrong result when to concurrency merge global stats (#48852) (#…

24213f2

…51146) close #48713

ti-chi-bot bot pushed a commit that referenced this pull request Feb 19, 2024

*: fix wrong result when to concurrency merge global stats (#48852) (#…

2027efd

…51147) close #48713

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: fix wrong result when to concurrency merge global stats #48852

*: fix wrong result when to concurrency merge global stats #48852

hawkingrei commented Nov 23, 2023 •

edited

Loading

codecov bot commented Nov 23, 2023 •

edited

Loading

hawkingrei Nov 24, 2023

hawkingrei Nov 24, 2023 •

edited

Loading

hawkingrei Nov 24, 2023

elsa0520 Nov 24, 2023

hawkingrei Nov 24, 2023

elsa0520 left a comment

ti-chi-bot bot commented Nov 24, 2023

ti-chi-bot bot commented Nov 24, 2023

hawkingrei commented Nov 24, 2023

ti-chi-bot commented Nov 24, 2023

hawkingrei commented Feb 19, 2024

ti-chi-bot commented Feb 19, 2024

ti-chi-bot commented Feb 19, 2024

*: fix wrong result when to concurrency merge global stats #48852

*: fix wrong result when to concurrency merge global stats #48852

Conversation

hawkingrei commented Nov 23, 2023 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

codecov bot commented Nov 23, 2023 • edited Loading

Codecov Report

hawkingrei Nov 24, 2023

Choose a reason for hiding this comment

hawkingrei Nov 24, 2023 • edited Loading

Choose a reason for hiding this comment

hawkingrei Nov 24, 2023

Choose a reason for hiding this comment

elsa0520 Nov 24, 2023

Choose a reason for hiding this comment

hawkingrei Nov 24, 2023

Choose a reason for hiding this comment

elsa0520 left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Nov 24, 2023

[LGTM Timeline notifier]

ti-chi-bot bot commented Nov 24, 2023

hawkingrei commented Nov 24, 2023

ti-chi-bot commented Nov 24, 2023

hawkingrei commented Feb 19, 2024

ti-chi-bot commented Feb 19, 2024

ti-chi-bot commented Feb 19, 2024

hawkingrei commented Nov 23, 2023 •

edited

Loading

codecov bot commented Nov 23, 2023 •

edited

Loading

hawkingrei Nov 24, 2023 •

edited

Loading