bench-tps rebase
This commit is contained in:
parent
708876e9a7
commit
f6e3464ab9
|
@ -2,27 +2,19 @@
|
||||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
name = "solana-bench-tps"
|
name = "solana-bench-tps"
|
||||||
version = "0.1.0"
|
version = "0.11.0"
|
||||||
repository = "https://github.com/solana-labs/solana"
|
repository = "https://github.com/solana-labs/solana"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
homepage = "http://solana.com/"
|
homepage = "https://solana.com/"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = "2.32.0"
|
clap = "2.32.0"
|
||||||
rayon = "1.0.3"
|
rayon = "1.0.3"
|
||||||
|
serde_json = "1.0.10"
|
||||||
|
solana = { path = "..", version = "0.11.0" }
|
||||||
|
solana-drone = { path = "../drone", version = "0.11.0" }
|
||||||
|
solana-metrics = { path = "../metrics", version = "0.11.0" }
|
||||||
|
solana-sdk = { path = "../sdk", version = "0.11.0" }
|
||||||
|
|
||||||
[dependencies.solana]
|
[features]
|
||||||
path = ".."
|
cuda = []
|
||||||
version = "0.11.0"
|
|
||||||
|
|
||||||
[dependencies.solana-sdk]
|
|
||||||
path = "../sdk"
|
|
||||||
version = "0.11.0"
|
|
||||||
|
|
||||||
[dependencies.solana-metrics]
|
|
||||||
path = "../metrics"
|
|
||||||
version = "0.11.0"
|
|
||||||
|
|
||||||
[dependencies.solana-drone]
|
|
||||||
path = "../drone"
|
|
||||||
version = "0.11.0"
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ use solana::logger;
|
||||||
use solana::service::Service;
|
use solana::service::Service;
|
||||||
use solana::signature::GenKeys;
|
use solana::signature::GenKeys;
|
||||||
use solana::thin_client::poll_gossip_for_leader;
|
use solana::thin_client::poll_gossip_for_leader;
|
||||||
use solana::window::default_window;
|
|
||||||
use solana_metrics;
|
use solana_metrics;
|
||||||
use solana_sdk::signature::KeypairUtil;
|
use solana_sdk::signature::KeypairUtil;
|
||||||
|
|
||||||
|
@ -47,9 +46,7 @@ fn converge(
|
||||||
spy_cluster_info.insert_info(leader.clone());
|
spy_cluster_info.insert_info(leader.clone());
|
||||||
spy_cluster_info.set_leader(leader.id);
|
spy_cluster_info.set_leader(leader.id);
|
||||||
let spy_ref = Arc::new(RwLock::new(spy_cluster_info));
|
let spy_ref = Arc::new(RwLock::new(spy_cluster_info));
|
||||||
let window = Arc::new(RwLock::new(default_window()));
|
let gossip_service = GossipService::new(&spy_ref, None, gossip_socket, exit_signal.clone());
|
||||||
let gossip_service =
|
|
||||||
GossipService::new(&spy_ref, window, None, gossip_socket, exit_signal.clone());
|
|
||||||
let mut v: Vec<NodeInfo> = vec![];
|
let mut v: Vec<NodeInfo> = vec![];
|
||||||
// wait for the network to converge, 30 seconds should be plenty
|
// wait for the network to converge, 30 seconds should be plenty
|
||||||
for _ in 0..30 {
|
for _ in 0..30 {
|
||||||
|
|
|
@ -41,17 +41,12 @@ if [[ -n $BUILDKITE_TAG && -n $TRIGGERED_BUILDKITE_TAG ]]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
for crate in "${CRATES[@]}"; do
|
for crate in "${CRATES[@]}"; do
|
||||||
if [[ ! -r $crate/Cargo.toml ]]; then
|
if [[ ! -r $crate/Cargo.toml ]]; then
|
||||||
echo "Error: $crate/Cargo.toml does not exist"
|
echo "Error: $crate/Cargo.toml does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "-- $crate"
|
echo "-- $crate"
|
||||||
=======
|
|
||||||
# shellcheck disable=2044 # Disable 'For loops over find output are fragile...'
|
|
||||||
for Cargo_toml in {sdk,metrics,drone,bench-tps,programs/native/{budget,bpf_loader,lua_loader,native_loader,noop,system,vote},.}/Cargo.toml; do
|
|
||||||
>>>>>>> Fix CI and related issues in bench-tps
|
|
||||||
# TODO: Ensure the published version matches the contents of BUILDKITE_TAG
|
# TODO: Ensure the published version matches the contents of BUILDKITE_TAG
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
|
|
Loading…
Reference in New Issue