Skip to content

[to #556] slowlog: attach cluster_id and pd_addresses to slow log properties#557

Merged
zz-jason merged 4 commits intotikv:masterfrom
iosmanthus:slow-log-with-cluster-info
Mar 21, 2022
Merged

[to #556] slowlog: attach cluster_id and pd_addresses to slow log properties#557
zz-jason merged 4 commits intotikv:masterfrom
iosmanthus:slow-log-with-cluster-info

Conversation

@iosmanthus
Copy link
Copy Markdown
Member

@iosmanthus iosmanthus commented Mar 16, 2022 •
edited
Loading

Signed-off-by: iosmanthus myosmanthustree@gmail.com

What problem does this PR solve?

Issue Number: to #556

Problem Description:
Attach cluster_id and pd_addresses to slow log to distinguish the request destination while handling multiple TiKV clusters.

What is changed and how does it work?

Add withFields for SlowLogImpl, and use this interface to attach info dynamically while constructing the slow logger.

Code changes

  • Has exported function/method change

Check List for Tests

This PR has been tested by at least one of the following methods:

  • Unit test

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to be included in the release note

@iosmanthus
slowlog: attach cluster_id and pd_addresses to slow log properties
cdd24de 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
marsishandsome
marsishandsome previously approved these changes Mar 17, 2022
View reviewed changes
Copy link
Copy Markdown
Collaborator

@marsishandsome marsishandsome left a comment

Choose a reason for hiding this comment

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

LGTM

@iosmanthus
slowlog: remove extra empty line
254aaaf 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus iosmanthus changed the title [close #556] slowlog: attach cluster_id and pd_addresses to slow log properties [to #556] slowlog: attach cluster_id and pd_addresses to slow log properties Mar 17, 2022
marsishandsome
marsishandsome previously approved these changes Mar 17, 2022
View reviewed changes
zz-jason
zz-jason previously approved these changes Mar 17, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@zz-jason zz-jason 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-srebot
ti-srebot previously approved these changes Mar 17, 2022
View reviewed changes
@iosmanthus iosmanthus mentioned this pull request Mar 18, 2022
Open
2 tasks
@iosmanthus
slowlog: get cluster id in constructor
aaabdd2 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@iosmanthus iosmanthus dismissed stale reviews from ti-srebot, zz-jason, and marsishandsome via aaabdd2 March 21, 2022 08:40
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 21, 2022 •
edited
Loading

Codecov Report

Merging #557 (284814c) into master (9798382) will decrease coverage by 0.18%.
The diff coverage is 94.73%.

@@             Coverage Diff              @@
##             master     #557      +/-   ##
============================================
- Coverage     32.23%   32.05%   -0.19%     
  Complexity     1332     1332              
============================================
  Files           278      279       +1     
  Lines         17345    17372      +27     
  Branches       1975     1980       +5     
============================================
- Hits           5591     5568      -23     
- Misses        11145    11194      +49     
- Partials        609      610       +1
Impacted Files Coverage Δ
...ain/java/org/tikv/common/log/SlowLogEmptyImpl.java 57.14% <0.00%> (-9.53%) ⬇️
src/main/java/org/tikv/raw/RawKVClient.java 61.83% <92.85%> (+0.18%) ⬆️
src/main/java/org/tikv/common/PDClient.java 59.75% <100.00%> (+0.19%) ⬆️
src/main/java/org/tikv/common/log/SlowLog.java 100.00% <100.00%> (ø)
src/main/java/org/tikv/common/log/SlowLogImpl.java 98.50% <100.00%> (+0.63%) ⬆️
...rc/main/java/io/grpc/netty/NettyClientHandler.java 55.81% <0.00%> (-7.55%) ⬇️
...ty/handler/codec/http2/Http2ConnectionHandler.java 49.87% <0.00%> (-3.18%) ⬇️
...va/org/tikv/common/region/StoreHealthyChecker.java 63.15% <0.00%> (-1.32%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9798382...284814c. Read the comment docs.

@iosmanthus
slowlog: ./dev/javafmt
284814c 
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
@zz-jason zz-jason merged commit d354ffc into tikv:master Mar 21, 2022
ti-srebot pushed a commit to ti-srebot/client-java that referenced this pull request Mar 21, 2022
@iosmanthus @ti-srebot
cherry pick tikv#557 to release-3.1
a019f76 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 21, 2022
Merged
@ti-srebot
Copy link
Copy Markdown
Collaborator

ti-srebot commented Mar 21, 2022

cherry pick to release-3.1 in PR #559

ti-srebot pushed a commit to ti-srebot/client-java that referenced this pull request Mar 21, 2022
@iosmanthus @ti-srebot
cherry pick tikv#557 to release-3.2
6cb6c86 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 21, 2022
Merged
@ti-srebot
Copy link
Copy Markdown
Collaborator

ti-srebot commented Mar 21, 2022

cherry pick to release-3.2 in PR #560

zz-jason pushed a commit that referenced this pull request Mar 24, 2022
@ti-srebot @iosmanthus
[to #556] slowlog: attach cluster_id and pd_addresses to slow log pro…
ea65650 
…perties (#557) (#559)

Co-authored-by: iosmanthus <dengliming@pingcap.com>
Co-authored-by: iosmanthus <myosmanthustree@gmail.com>
zz-jason added a commit that referenced this pull request Mar 28, 2022
@ti-srebot @iosmanthus @zz-jason
[to #556] slowlog: attach cluster_id and pd_addresses to slow log pro…
7a4904e 
…perties (#557) (#560)

Co-authored-by: iosmanthus <dengliming@pingcap.com>
Co-authored-by: Jian Zhang <zjsariel@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marsishandsome marsishandsome marsishandsome left review comments

@ti-srebot ti-srebot ti-srebot left review comments

+1 more reviewer

@zz-jason zz-jason zz-jason approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

component/common component/rawkv status/LGT2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@iosmanthus @ti-srebot @zz-jason @marsishandsome