Drazen Urch
af9f6e5ca0
* feat(db): add SQL query wrapper for PostgreSQL placeholder conversion - Created query_wrapper module with functions to automatically convert SQLite ? placeholders to PostgreSQL $1, $2, ... format - Updated build.rs to handle mutually exclusive feature flags - Modified one query in mixnodes.rs as proof of concept - Added type conversions for PostgreSQL compatibility (u32->i64, u16->i32) This is a checkpoint commit before converting all queries to use the wrapper. * feat(nym-node-status-api): add PostgreSQL database support via feature flags Implement dual database support for SQLite and PostgreSQL through Cargo feature flags. The implementation uses a query wrapper that automatically converts SQLite-style ? placeholders to PostgreSQL-style $1, $2, ... placeholders at runtime. Key changes: - Add query wrapper functions that handle placeholder conversion - Convert all sqlx::query\! macros to use wrapper functions - Handle type conversions between databases (i64 vs i32) - Add feature-gated implementations for database-specific SQL syntax - Update Makefile with clippy targets for both database features - Document database support in README * feat(nym-node-status-agent): add multi-API support with random selection Agents can now connect to multiple APIs and randomly select one for each testrun: - Accept multiple --server arguments in format "address:port:auth_key" - Randomly shuffle server list before attempting connections - Try each server until a testrun is obtained - Submit results back only to the API that provided the testrun - Continue to next server if one is down or has no testruns available * feat(nym-node-status): implement primary/secondary server architecture - Agent now requests testruns only from primary server (first in list) - Results are submitted to all configured servers in parallel - Secondary servers accept external testruns via new v2 endpoint - Added auto-creation of gateway and testrun records on secondary servers - New database queries: get_or_create_gateway, insert_external_testrun - Client library enhanced with submit_results_with_context method * Bump Node status API version * Fix build workdir * Bump to 3.1.4 * Fix types and queries * 3.1.6 * Fix gateway perf, bump 3.1.7 * NodeId -> i32, 3.1.8 * Bump agent version * i64 -> i32 * Use image yq * Migration and more types * Update remaining JSONB columns * Simplify server config * Update build path * Change delimiter * bump agent * Split up pg and sqlite builds * More typing fixes, build-and-push script * Fix Dockerfile-pg * Bump node-status-api * TYping * Agent build script * More logging around testruns * Fail loudly on read errors * Cleanup * Debug get gateways query * Fix get_gateways query * Use pg cert, 3.1.16 * Submit regular results to primary server * Bump freshenss cutoff * Update Cargo.lock * fix: resolve rebase conflicts and compilation errors After rebasing onto develop, fixed several issues: - Fixed borrowed data escapes error by using sqlx::query directly in transaction functions - Removed unused imports and cleaned up code - Maintained database-specific implementations for transaction functions * fmt * Make PG default to make lives easier * Performance improvements for Explorer v2 * Fix sqlite build * Fix PG migration * Tests round 1 * DB tests * More tests * And some more tests * And some more, more tests * cargo fmt * Fix some failing lints * Fix lioness version problems * Clippy in tests --------- Co-authored-by: dynco-nym <173912580+dynco-nym@users.noreply.github.com>
84 lines
2.4 KiB
Rust
84 lines
2.4 KiB
Rust
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
use crate::cli::helpers::ConfigArgs;
|
|
use crate::logging::granual_filtered_env;
|
|
use crate::throughput_tester::test_mixing_throughput;
|
|
use anyhow::bail;
|
|
use humantime_serde::re::humantime;
|
|
use nym_bin_common::logging::default_tracing_fmt_layer;
|
|
use std::env::temp_dir;
|
|
use std::path::PathBuf;
|
|
use std::time::Duration;
|
|
use time::OffsetDateTime;
|
|
use tracing_indicatif::IndicatifLayer;
|
|
use tracing_subscriber::layer::SubscriberExt;
|
|
use tracing_subscriber::util::SubscriberInitExt;
|
|
|
|
#[derive(Debug, clap::Args)]
|
|
pub struct Args {
|
|
#[clap(flatten)]
|
|
config: ConfigArgs,
|
|
|
|
#[clap(long, default_value_t = 10)]
|
|
senders: usize,
|
|
|
|
/// target packet latency, if current value is below threshold, clients will increase their sending rates
|
|
/// and similarly if it's above it, they will decrease it
|
|
#[clap(long, default_value = "15ms", value_parser = humantime::parse_duration)]
|
|
packet_latency_threshold: Duration,
|
|
|
|
#[clap(long, default_value_t = 50)]
|
|
starting_sending_batch_size: usize,
|
|
|
|
#[clap(long, default_value = "50ms", value_parser = humantime::parse_duration)]
|
|
starting_sending_delay: Duration,
|
|
|
|
#[clap(long, short)]
|
|
output_directory: Option<PathBuf>,
|
|
}
|
|
|
|
fn init_test_logger() -> anyhow::Result<()> {
|
|
let indicatif_layer = IndicatifLayer::new()
|
|
.with_span_child_prefix_symbol("↳ ")
|
|
.with_span_child_prefix_indent(" ");
|
|
|
|
tracing_subscriber::registry()
|
|
.with(default_tracing_fmt_layer(
|
|
indicatif_layer.get_stderr_writer(),
|
|
))
|
|
.with(indicatif_layer)
|
|
.with(granual_filtered_env()?)
|
|
.init();
|
|
Ok(())
|
|
}
|
|
|
|
pub fn execute(args: Args) -> anyhow::Result<()> {
|
|
init_test_logger()?;
|
|
|
|
let output_dir = match args.output_directory {
|
|
Some(output_dir) => {
|
|
if !output_dir.is_dir() {
|
|
bail!("'{}' is not a directory", output_dir.display());
|
|
}
|
|
|
|
output_dir
|
|
}
|
|
None => {
|
|
let now = OffsetDateTime::now_utc().unix_timestamp();
|
|
temp_dir()
|
|
.join("nym-node-throughput-testing")
|
|
.join(now.to_string())
|
|
}
|
|
};
|
|
|
|
test_mixing_throughput(
|
|
args.config.config_path(),
|
|
args.senders,
|
|
args.packet_latency_threshold,
|
|
args.starting_sending_batch_size,
|
|
args.starting_sending_delay,
|
|
output_dir,
|
|
)
|
|
}
|