Add clients #41
Add clients #41
Conversation
| @@ -191,15 +193,20 @@ USER solana | |||
| COPY --chown=solana:solana {startup_script_directory} /home/solana/k8s-cluster-scripts | |||
| RUN chmod +x /home/solana/k8s-cluster-scripts/* | |||
| COPY --chown=solana:solana ./config-k8s/bootstrap-validator /home/solana/ledger | |||
| COPY --chown=solana:solana ./{solana_build_directory}/bin/ /home/solana/.cargo/bin/ | |||
| COPY --chown=solana:solana ./{solana_build_directory}/bin/ /home/solana/bin/ | |||
src/docker.rs
Outdated
| let dockerfile = format!( | ||
| "{dockerfile}\n{}", | ||
| self.insert_client_accounts_if_present(solana_root_path, validator_type)?, | ||
| ); |
There was a problem hiding this comment.
nit: how about tacking on this bit into the previous call to format!? Ie.
let dockerfile = format!(r#"
.....
{}
"#, self.base_image, self.insert_client_accounts_if_present(solana_root_path, validator_type)?);
src/genesis.rs
Outdated
| in_file: &PathBuf, //bench-tps-i.yml | ||
| out_file: &PathBuf, //client-accounts.yml |
There was a problem hiding this comment.
nit: up to you, but if the commented names are needed, may as well change the parameter names in the function!
There was a problem hiding this comment.
great point lol
src/main.rs
Outdated
| .to_string(), | ||
| client_to_run: matches | ||
| .value_of("client_to_run") | ||
| .unwrap_or_default() |
There was a problem hiding this comment.
same here, I think unwrap() will be better
src/main.rs
Outdated
| target_node: match matches.value_of("target_node") { | ||
| Some(s) => match s.parse::<Pubkey>() { | ||
| Ok(pubkey) => Some(pubkey), | ||
| Err(e) => return Err(format!("failed to parse pubkey in target_node: {e}").into()), | ||
| }, | ||
| None => None, | ||
| }, |
There was a problem hiding this comment.
Feel free to use clap_utils::input_parsers::pubkey_of to avoid this annoyance
src/main.rs
Outdated
| @@ -558,7 +658,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { | |||
| kub_controller | |||
| .deploy_secret(bootstrap_validator.secret()) | |||
| .await?; | |||
| info!("Deployed Bootstrap Secret"); | |||
| info!("Bootstrap Secret deployed"); | |||
There was a problem hiding this comment.
micro-nit: I actually prefer the new active style more that you're using in the other logs, but it's up to you
| info!("Bootstrap Secret deployed"); | |
| info!("Deployed Bootstrap Secret"); |
There was a problem hiding this comment.
ahh ya i went back and forth on this. will update
| for rpc_name in &rpc_nodes { | ||
| if kub_controller.is_replica_set_ready(rpc_name).await? { | ||
| ready = true; | ||
| break; | ||
| break 'outer; |
| if num_validators == 0 { | ||
| info!("No validators to deploy. Returning"); | ||
| return Ok(()); | ||
| if num_validators > 0 { |
There was a problem hiding this comment.
Highly recommend "hide whitespace" to review this part 😅
Summary of Changes