Skip to content

p2p: Split network logging into two categories #24247

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
Closed
wants to merge 0 commits into from
Closed

p2p: Split network logging into two categories #24247

wants to merge 0 commits into from

Conversation

anshu-khare-design
Copy link

This PR is to resolve issue 20576. It focuses on introducing different levels of net logging. As a starting point, as mentioned in the issue #20576 , it creates separate lower-frequency, important peer-level events (netpeers) from very high-frequency message-level passing (netmessages).

@laanwj laanwj changed the title Issue 20576 p2p: Split network logging into two categories Feb 3, 2022
@laanwj laanwj added the P2P label Feb 3, 2022
brunoerg
brunoerg reviewed Feb 3, 2022
View reviewed changes
Copy link
Contributor

@brunoerg brunoerg left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hi, @anshu-khare-design. Thanks for this. Some points:

  1. I think you might write a more appropriate commit message (maybe the same as the PR title)
  2. CI is failing because of rpc_miscfunctional test:
# Test logging RPC returns the expected number of logging categories.
assert_equal(len(node.logging()), 27)

this assertion is failing because with this PR we have one more category, so, in total, 28. You should update this test as well.

anshu-khare-design added a commit to anshu-khare-design/bitcoin that referenced this pull request Feb 3, 2022
@anshu-khare-design
p2p: Split network logging into two categories bitcoin#24247
f9f4d37
@brunoerg
Copy link
Contributor

brunoerg commented Feb 3, 2022

Cool. Now you should squash the commits. See: https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits

anshu-khare-design pushed a commit to anshu-khare-design/bitcoin that referenced this pull request Feb 4, 2022
@anshu-khare-design
ci: Bump CentOS 8 image
bbb9a97 
scripted-diff: Rename DOCKER_EXEC to CI_EXEC

-BEGIN VERIFY SCRIPT-
 sed -i "s/DOCKER_EXEC/CI_EXEC/g" $(git grep -l DOCKER_EXEC)
-END VERIFY SCRIPT-

ci: Use dash when building depends in centos build

p2p: Split network logging into two categories bitcoin#24247

Issue 20576
@anshu-khare-design
Copy link
Author

Oops.. I think I did something wrong..
I first wrote

$ git rebase -i HEAD~3
$ git pull origin issue_20576 (Since it was asking me to take a pull)
$ git push origin issue_20576

@ghost
Copy link

ghost commented Feb 4, 2022

@anshu-khare-design try this

git reset --hard 133f73e86bd7c3114263500be2fb5090dd76b4bc

git push origin +133f73e86bd7c3114263500be2fb5090dd76b4bc^:issue_20576

git push origin 133f73e86bd7c3114263500be2fb5090dd76b4bc:issue_20576

This will close the pull request, it will have 0 commits and you can start fresh in your fork repository

Make all the changes in the code, do 1 commit and reopen pull request.

@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 4, 2022

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #24230 (indexes: Stop using node internal types and locking cs_main, improve sync logic by ryanofsky)
  • #24178 (p2p: Respond to getheaders if we have sufficient chainwork by sdaftuar)
  • #24008 (assumeutxo: net_processing changes by jamesob)
  • #23604 (Use Sock in CNode by vasild)
  • #23443 (p2p: Erlay support signaling by naumenkogs)
  • #22778 (net processing: Reduce resource usage for inbound block-relay-only connections by jnewbery)
  • #22053 (refactor: Release cs_main before MaybeSendFeefilter by MarcoFalke)
  • #21160 (net/net processing: Move tx inventory into net_processing by jnewbery)
  • #20799 (net processing: Only support version 2 compact blocks by jnewbery)
  • #20726 (p2p: Add DISABLETX message for negotiating block-relay-only connections by sdaftuar)
  • #15606 (assumeutxo by jamesob)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

This was referenced Feb 4, 2022
Draft
Merged
@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 4, 2022

🐙 This pull request conflicts with the target branch and needs rebase.

Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".

This was referenced Feb 4, 2022
Closed
Merged
Merged
Merged
Closed
Merged
Merged
Closed
Closed
@brunoerg
Copy link
Contributor

brunoerg commented Feb 5, 2022

@prayank23 gave some tips. Feel free to ask for help whenever needed.

anshu-khare-design added a commit to anshu-khare-design/bitcoin that referenced this pull request Feb 5, 2022
@anshu-khare-design
p2p: Split network logging into two categories bitcoin#24247
0dba612
@fanquake
Copy link
Member

fanquake commented Feb 6, 2022

Please don't open new PRs for the same change. (#24273).

This was referenced Feb 8, 2022
Closed
Closed
@DrahtBot DrahtBot mentioned this pull request Feb 14, 2022
Merged
This was referenced Feb 24, 2022
Merged
Closed
@bitcoin bitcoin locked and limited conversation to collaborators Feb 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@brunoerg brunoerg brunoerg left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Needs rebase P2P Utils/log/libs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@anshu-khare-design @brunoerg @DrahtBot @fanquake @laanwj