net: Add -networkactive option #19473

hebasto · 2020-07-09T07:33:00Z

Some Bitcoin Core activity is completely local (offline), e.g., reindexing.

The setnetworkactive RPC command is already present. This PR adds the corresponding command-line argument / config option, and allows to start the client with disabled p2p network by providing -networkactive=0 or -nonetworkactive.

This was done while reviewing #16981.

maflcko · 2020-07-09T08:53:14Z

There was an idea to overload -noconnect with this. #15900 (comment)

No opinion on that, though.

Concept ACK on adding the functionality.

LarryRuane

Nice PR! I tested various combinations:

bitcoind -networkactive
bitcoind -networkactive=1
bitcoind -networkactive=0
bitcoind -nonetworkactive

and the behavior was as expected (the first two enabled and the second two disabled networking). I also verified that after disabling networking on the command line, I could change it in both directions using the setnetworkactive RPC.

I think it's okay that there's no unit test, because this is test code anyway, and there's no easy place to add one. The only thing bad that could happen is networking isn't enabled by default, and that would be noticed right away!

If you can fix that tiny quote problem, I'd be happy to approve.

src/init.cpp

hebasto · 2020-07-14T16:14:55Z

@LarryRuane

The only thing bad that could happen is networking isn't enabled by default, and that would be noticed right away!

I think it is enabled by default :)

LarryRuane · 2020-07-15T03:25:05Z

I think it is enabled by default :)

Yes, sorry, my comment wasn't clear; I just meant that without a test, a bug in this PR could conceivably make networking disabled by default. But, as I said, that would be pretty obvious, so I'm not worried! Plus, now that I think about it, there are numerous existing tests that would fail. So never mind. I was just trying to support your decision not to include a test.

maflcko

Tested in the gui:

$ ./src/qt/bitcoin-qt -? |grep -A1 networka
  -networkactive
       Enable all p2p network activity (default: 1). Could be changed by the
       setnetworkactive RPC command

ACK e9a9c97 🎈

Show signature and timestamp

Signature:

Timestamp of file with hash 289aaa99e8660b4dd3573b6eabcfd374fdeaf85e793ebd854168b6684124745b -

Though, I used the following diff:

diff --git a/src/init.cpp b/src/init.cpp
index a726c5e062..615f3929d4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -455,7 +455,7 @@ void SetupServerArgs(NodeContext& node)
     gArgs.AddArg("-proxy=<ip:port>", "Connect through SOCKS5 proxy, set -noproxy to disable (default: disabled)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     gArgs.AddArg("-proxyrandomize", strprintf("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)", DEFAULT_PROXYRANDOMIZE), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     gArgs.AddArg("-seednode=<ip>", "Connect to a node to retrieve peer addresses, and disconnect. This option can be specified multiple times to connect to multiple nodes.", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
-    gArgs.AddArg("-networkactive", "Enable all p2p network activity (default: 1). Could be changed by the `setnetworkactive' RPC command", ArgsManager::ALLOW_BOOL | ArgsManager::DEBUG_ONLY, OptionsCategory::CONNECTION);
+    gArgs.AddArg("-networkactive", "Enable all p2p network activity (default: 1). Could be changed by the setnetworkactive RPC command", ArgsManager::ALLOW_BOOL, OptionsCategory::CONNECTION);
     gArgs.AddArg("-timeout=<n>", strprintf("Specify connection timeout in milliseconds (minimum: 1, default: %d)", DEFAULT_CONNECT_TIMEOUT), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
     gArgs.AddArg("-peertimeout=<n>", strprintf("Specify p2p connection timeout in seconds. This option determines the amount of time a peer may be inactive before the connection to it is dropped. (minimum: 1, default: %d)", DEFAULT_PEER_CONNECT_TIMEOUT), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CONNECTION);
     gArgs.AddArg("-torcontrol=<ip>:<port>", strprintf("Tor control port to use if onion listening enabled (default: %s)", DEFAULT_TOR_CONTROL), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
@@ -1373,7 +1373,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node)
     assert(!node.banman);
     node.banman = MakeUnique<BanMan>(GetDataDir() / "banlist.dat", &uiInterface, gArgs.GetArg("-bantime", DEFAULT_MISBEHAVING_BANTIME));
     assert(!node.connman);
-    node.connman = std::unique_ptr<CConnman>(new CConnman(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max()), gArgs.GetBoolArg("-networkactive", true)));
+    node.connman = MakeUnique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max()), gArgs.GetBoolArg("-networkactive", true));
     // Make mempool generally available in the node context. For example the connection manager, wallet, or RPC threads,
     // which are all started after this, may use it from the node context.
     assert(!node.mempool);

src/init.cpp

jonatack · 2020-07-18T07:08:52Z

Mind adding test coverage?

hebasto · 2020-07-18T09:07:09Z

Updated e9a9c97 -> a323249 (pr19473.01 -> pr19473.02, diff):

addressed all comments

DrahtBot · 2020-07-18T21:06:24Z

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

refactor: Pass ArgsManager into functions that register args #19561 (refactor: Pass ArgsManager into functions that register args by S3RK)
rpc, cli: add network in/out connections to getnetworkinfo and -getinfo #19405 (rpc, cli: add network in/out connections to getnetworkinfo and -getinfo by jonatack)

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.

laanwj · 2020-07-22T19:19:53Z

src/init.cpp

@@ -456,6 +456,7 @@ void SetupServerArgs(NodeContext& node)
    gArgs.AddArg("-proxy=<ip:port>", "Connect through SOCKS5 proxy, set -noproxy to disable (default: disabled)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
    gArgs.AddArg("-proxyrandomize", strprintf("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)", DEFAULT_PROXYRANDOMIZE), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
    gArgs.AddArg("-seednode=<ip>", "Connect to a node to retrieve peer addresses, and disconnect. This option can be specified multiple times to connect to multiple nodes.", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);
+    gArgs.AddArg("-networkactive", "Enable all p2p network activity (default: 1). Can be changed by the setnetworkactive RPC command", ArgsManager::ALLOW_BOOL, OptionsCategory::CONNECTION);


Please capitalize P2P

Indeed!

Updated.

src/net.cpp

laanwj · 2020-07-22T19:27:34Z

utACK otherwise

The `setnetworkactive' RPC command is already present. This new option allows to start the client with disabled p2p network activity for testing or reindexing.

hebasto · 2020-07-22T20:01:55Z

Updated a323249 -> 2aac093 (pr19473.02 -> pr19473.03, diff):

addressed @laanwj's comment:

Please capitalize P2P

addressed @laanwj's comment:

I don't think it makes any difference in practice in this case, but isn't the general convention to call functions like this on the object only after Init?

LarryRuane

ACK 2aac093

maflcko · 2020-07-23T16:32:32Z

re-ACK 2aac093 🏠

Show signature and timestamp

Signature:

Timestamp of file with hash 79e733808b8f76828a454a01b6ad120aa8619b7cef190ba12821d040e4881d01 -

The `setnetworkactive' RPC command is already present. This new option allows to start the client with disabled p2p network activity for testing or reindexing. Github-Pull: bitcoin#19473 Rebased-From: aabc6af

Github-Pull: bitcoin#19473 Rebased-From: e9a9c97

Summary: Some Bitcoin activity is completely local (offline), e.g., reindexing. The `setnetworkactive` RPC command is already present. This PR adds the corresponding command-line argument / config option, and allows to start the client with disabled p2p network by providing `-networkactive=0` or `-nonetworkactive`. Commit message #1: > net: Add -networkactive option > > The `setnetworkactive' RPC command is already present. > This new option allows to start the client with disabled p2p network > activity for testing or reindexing. Commit message #2: >net: Log network activity status change unconditionally Commit message #3: > test: Add test coverage for -networkactive option This is a backport of [[bitcoin/bitcoin#19473 | core#19473]] Test Plan: `ninja all check-all` Reviewers: #bitcoin_abc, majcosta Reviewed By: #bitcoin_abc, majcosta Subscribers: Fabien Differential Revision: https://reviews.bitcoinabc.org/D9713

fanquake added the P2P label Jul 9, 2020

maflcko added the Settings label Jul 9, 2020

maflcko mentioned this pull request Jul 9, 2020

Unifiy network activity status and 'connect' command line option #15900

Closed

LarryRuane reviewed Jul 13, 2020

View reviewed changes

src/init.cpp Outdated Show resolved Hide resolved

maflcko approved these changes Jul 18, 2020

View reviewed changes

src/init.cpp Outdated Show resolved Hide resolved

src/init.cpp Outdated Show resolved Hide resolved

hebasto force-pushed the 200709-setnet branch from e9a9c97 to a323249 Compare July 18, 2020 09:03

This was referenced Jul 18, 2020

rpc, cli: add network in/out connections to getnetworkinfo and -getinfo #19405

Merged

Remove mempool global #19556

Merged

refactor: Pass ArgsManager into functions that register args #19561

Merged

laanwj reviewed Jul 22, 2020

View reviewed changes

src/net.cpp Outdated Show resolved Hide resolved

hebasto added 3 commits July 22, 2020 22:55

net: Add -networkactive option

62fe6aa

The `setnetworkactive' RPC command is already present. This new option allows to start the client with disabled p2p network activity for testing or reindexing.

net: Log network activity status change unconditionally

3c58129

test: Add test coverage for -networkactive option

2aac093

hebasto force-pushed the 200709-setnet branch from a323249 to 2aac093 Compare July 22, 2020 20:00

LarryRuane approved these changes Jul 23, 2020

View reviewed changes

maflcko merged commit 6ee36a2 into bitcoin:master Jul 23, 2020

hebasto deleted the 200709-setnet branch July 23, 2020 22:52

luke-jr pushed a commit to bitcoinknots/bitcoin that referenced this pull request Aug 15, 2020

net: Log network activity status change unconditionally

a76ee98

Github-Pull: bitcoin#19473 Rebased-From: e9a9c97

bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

net: Add -networkactive option #19473

net: Add -networkactive option #19473

hebasto commented Jul 9, 2020

maflcko commented Jul 9, 2020

LarryRuane left a comment

hebasto commented Jul 14, 2020

LarryRuane commented Jul 15, 2020

maflcko left a comment

jonatack commented Jul 18, 2020

hebasto commented Jul 18, 2020

DrahtBot commented Jul 18, 2020 •

edited

laanwj Jul 22, 2020

hebasto Jul 22, 2020

laanwj commented Jul 22, 2020

hebasto commented Jul 22, 2020

LarryRuane left a comment

maflcko commented Jul 23, 2020

net: Add -networkactive option #19473

net: Add -networkactive option #19473

Conversation

hebasto commented Jul 9, 2020

maflcko commented Jul 9, 2020

LarryRuane left a comment

Choose a reason for hiding this comment

hebasto commented Jul 14, 2020

LarryRuane commented Jul 15, 2020

maflcko left a comment

Choose a reason for hiding this comment

jonatack commented Jul 18, 2020

hebasto commented Jul 18, 2020

DrahtBot commented Jul 18, 2020 • edited

Conflicts

laanwj Jul 22, 2020

Choose a reason for hiding this comment

hebasto Jul 22, 2020

Choose a reason for hiding this comment

laanwj commented Jul 22, 2020

hebasto commented Jul 22, 2020

LarryRuane left a comment

Choose a reason for hiding this comment

maflcko commented Jul 23, 2020

DrahtBot commented Jul 18, 2020 •

edited