Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

adds validator flag to allow private ip addresses #18850

Merged
merged 1 commit into from
Jul 23, 2021

Conversation

behzadnouri
Copy link
Contributor

Problem

To address mainnet issue, #18728 excludes private ip addresses.
As a side effect, system-performance-tests broke:
#18728 (comment)

Summary of Changes

  • added validator flag to allow private ip addresses.

@behzadnouri behzadnouri requested a review from mvines July 22, 2021 21:11
@codecov
Copy link

codecov bot commented Jul 22, 2021

Codecov Report

Merging #18850 (894dc82) into master (5cabb5b) will decrease coverage by 0.0%.
The diff coverage is 87.5%.

@@            Coverage Diff            @@
##           master   #18850     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         443      443             
  Lines      126082   126294    +212     
=========================================
+ Hits       104507   104636    +129     
- Misses      21575    21658     +83     

Copy link
Contributor

@mvines mvines left a comment

Choose a reason for hiding this comment

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

💦 💦 That touched a lot more files than I was expecting it would!

But thanks, that was annoying I'm sure but the lack of a build feature is worth it.

r+ with solana-test-validator supporting private addresses by default

@@ -21,6 +21,7 @@ use {
signature::{read_keypair_file, write_keypair_file, Keypair, Signer},
system_program,
},
solana_streamer::socket::SocketAddrSpace,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think solana-test-validator should just allow private addresses by default (and it's probably fine to not have an option to only allow global this).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, true. I am merging this now not to get merge conflicts, but will follow up.

@behzadnouri behzadnouri merged commit d2d5f36 into solana-labs:master Jul 23, 2021
@behzadnouri behzadnouri deleted the addr-space branch July 23, 2021 15:25
mergify bot pushed a commit that referenced this pull request Jul 29, 2021
(cherry picked from commit d2d5f36)

# Conflicts:
#	accounts-cluster-bench/Cargo.toml
#	bench-tps/Cargo.toml
#	cli/Cargo.toml
#	core/benches/cluster_info.rs
#	core/src/banking_stage.rs
#	core/src/broadcast_stage.rs
#	core/src/broadcast_stage/broadcast_duplicates_run.rs
#	core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
#	core/src/broadcast_stage/standard_broadcast_run.rs
#	core/src/cluster_slots_service.rs
#	core/src/repair_service.rs
#	core/src/tvu.rs
#	core/src/validator.rs
#	dos/Cargo.toml
#	gossip/src/cluster_info.rs
#	gossip/src/crds_gossip_pull.rs
#	gossip/src/crds_gossip_push.rs
#	gossip/src/gossip_service.rs
#	local-cluster/Cargo.toml
#	local-cluster/src/cluster_tests.rs
#	local-cluster/tests/local_cluster.rs
#	rpc/Cargo.toml
#	rpc/src/rpc.rs
#	tokens/Cargo.toml
#	validator/Cargo.toml
#	validator/src/main.rs
mergify bot added a commit that referenced this pull request Jul 29, 2021
…18975)

* adds validator flag to allow private ip addresses (#18850)

(cherry picked from commit d2d5f36)

# Conflicts:
#	accounts-cluster-bench/Cargo.toml
#	bench-tps/Cargo.toml
#	cli/Cargo.toml
#	core/benches/cluster_info.rs
#	core/src/banking_stage.rs
#	core/src/broadcast_stage.rs
#	core/src/broadcast_stage/broadcast_duplicates_run.rs
#	core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
#	core/src/broadcast_stage/standard_broadcast_run.rs
#	core/src/cluster_slots_service.rs
#	core/src/repair_service.rs
#	core/src/tvu.rs
#	core/src/validator.rs
#	dos/Cargo.toml
#	gossip/src/cluster_info.rs
#	gossip/src/crds_gossip_pull.rs
#	gossip/src/crds_gossip_push.rs
#	gossip/src/gossip_service.rs
#	local-cluster/Cargo.toml
#	local-cluster/src/cluster_tests.rs
#	local-cluster/tests/local_cluster.rs
#	rpc/Cargo.toml
#	rpc/src/rpc.rs
#	tokens/Cargo.toml
#	validator/Cargo.toml
#	validator/src/main.rs

* removes backport merge conflicts

Co-authored-by: behzad nouri <[email protected]>
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants