mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-11-19 01:04:11 +00:00
test: use head greptime for read bench
Signed-off-by: discord9 <discord9@163.com>
This commit is contained in:
@@ -103,7 +103,7 @@ jobs:
|
||||
- name: Build base greptime
|
||||
working-directory: src
|
||||
run: |
|
||||
cargo build --profile "${CARGO_PROFILE}" -p cmd --bin greptime --features dev-tools
|
||||
cargo build --profile "${CARGO_PROFILE}" -p cmd --bin greptime
|
||||
target_dir="${CARGO_PROFILE}"
|
||||
if [[ "${CARGO_PROFILE}" == "dev" ]]; then
|
||||
target_dir="debug"
|
||||
@@ -122,7 +122,8 @@ jobs:
|
||||
- name: Build candidate greptime and fixture generators
|
||||
working-directory: src
|
||||
run: |
|
||||
cargo build --profile "${CARGO_PROFILE}" -p cmd --bin greptime --bin query_perf_fixture --features dev-tools
|
||||
cargo build --profile "${CARGO_PROFILE}" -p cmd --bin greptime
|
||||
cargo build --profile "${CARGO_PROFILE}" -p cmd --bin query_perf_fixture --features dev-tools
|
||||
target_dir="${CARGO_PROFILE}"
|
||||
if [[ "${CARGO_PROFILE}" == "dev" ]]; then
|
||||
target_dir="debug"
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ default = [
|
||||
"meta-srv/mysql_kvbackend",
|
||||
]
|
||||
enterprise = ["common-meta/enterprise", "frontend/enterprise", "meta-srv/enterprise"]
|
||||
# Developer-only tools (benchmarks, diagnostics) gating the `datanode parquetbench` subcommand.
|
||||
# Developer-only helper binary gate for `query_perf_fixture`.
|
||||
# Kept out of `default` so normal/release builds don't compile them.
|
||||
dev-tools = []
|
||||
tokio-console = ["common-telemetry/tokio-console"]
|
||||
|
||||
@@ -117,7 +117,6 @@ async fn start(cli: Command) -> Result<()> {
|
||||
}
|
||||
datanode::SubCommand::Objbench(ref bench) => bench.run().await,
|
||||
datanode::SubCommand::Scanbench(ref bench) => bench.run().await,
|
||||
#[cfg(feature = "dev-tools")]
|
||||
datanode::SubCommand::Parquetbench(ref bench) => bench.run().await,
|
||||
},
|
||||
SubCommand::Flownode(cmd) => {
|
||||
|
||||
@@ -15,11 +15,10 @@
|
||||
pub mod builder;
|
||||
#[allow(clippy::print_stdout)]
|
||||
pub(crate) mod objbench;
|
||||
#[cfg(feature = "dev-tools")]
|
||||
#[allow(clippy::print_stdout)]
|
||||
mod parquetbench;
|
||||
pub mod parquetbench;
|
||||
#[allow(clippy::print_stdout)]
|
||||
mod scanbench;
|
||||
pub mod scanbench;
|
||||
|
||||
use std::path::Path;
|
||||
use std::time::Duration;
|
||||
@@ -40,7 +39,6 @@ use tracing_appender::non_blocking::WorkerGuard;
|
||||
use crate::App;
|
||||
use crate::datanode::builder::InstanceBuilder;
|
||||
use crate::datanode::objbench::ObjbenchCommand;
|
||||
#[cfg(feature = "dev-tools")]
|
||||
use crate::datanode::parquetbench::ParquetbenchCommand;
|
||||
use crate::datanode::scanbench::ScanbenchCommand;
|
||||
use crate::error::{
|
||||
@@ -115,7 +113,6 @@ impl Command {
|
||||
SubCommand::Start(cmd) => cmd.load_options(global_options),
|
||||
// Bench commands are standalone utilities and don't need to load DatanodeOptions.
|
||||
SubCommand::Objbench(_) | SubCommand::Scanbench(_) => Self::default_bench_options(),
|
||||
#[cfg(feature = "dev-tools")]
|
||||
SubCommand::Parquetbench(_) => Self::default_bench_options(),
|
||||
}
|
||||
}
|
||||
@@ -141,7 +138,6 @@ pub enum SubCommand {
|
||||
/// Scan benchmark tool - benchmarks scanning a region directly from storage
|
||||
Scanbench(ScanbenchCommand),
|
||||
/// Benchmark scanning a single parquet SST.
|
||||
#[cfg(feature = "dev-tools")]
|
||||
Parquetbench(ParquetbenchCommand),
|
||||
}
|
||||
|
||||
@@ -160,7 +156,6 @@ impl SubCommand {
|
||||
cmd.run().await?;
|
||||
std::process::exit(0);
|
||||
}
|
||||
#[cfg(feature = "dev-tools")]
|
||||
SubCommand::Parquetbench(cmd) => {
|
||||
cmd.run().await?;
|
||||
std::process::exit(0);
|
||||
|
||||
@@ -391,9 +391,10 @@ query regression runs. It builds its own binaries for now:
|
||||
candidate checkout
|
||||
- runner and summary formatter from the candidate checkout
|
||||
|
||||
The workflow builds `cmd` binaries with the `dev-tools` feature so the helper
|
||||
binary and the datanode `parquetbench`/`scanbench` subcommands stay out of normal
|
||||
release builds but remain available to this opt-in perf job.
|
||||
The workflow builds base and candidate `greptime` as normal release-equivalent
|
||||
binaries. Candidate `query_perf_fixture` is the extra head-side helper binary;
|
||||
the runner uses candidate `greptime datanode parquetbench/scanbench` as the
|
||||
read-bench tool against each target's data directory.
|
||||
|
||||
The workflow runs automatically only for non-draft PRs labeled
|
||||
`query-regression` (on label/ready-for-review/reopen events, not every push).
|
||||
|
||||
@@ -964,7 +964,7 @@ def parse_sst_bench_target(target: RunTarget, inspection: dict[str, Any], file:
|
||||
}
|
||||
|
||||
|
||||
def run_read_bench(target: RunTarget, read_bench: dict[str, Any] | None, storage_inspection: dict[str, Any] | None, *, dry_run: bool) -> dict[str, Any]:
|
||||
def run_read_bench(bench_binary: Path, target: RunTarget, read_bench: dict[str, Any] | None, storage_inspection: dict[str, Any] | None, *, dry_run: bool) -> dict[str, Any]:
|
||||
if not read_bench or read_bench["enabled"] is False:
|
||||
return {"status": "skipped", "reason": "read_bench disabled"}
|
||||
run_parquetbench = read_bench["parquetbench"]
|
||||
@@ -992,7 +992,7 @@ def run_read_bench(target: RunTarget, read_bench: dict[str, Any] | None, storage
|
||||
iterations = str(int(read_bench["iterations"]))
|
||||
if run_parquetbench:
|
||||
for bench_target in bench_targets:
|
||||
cmd = [str(target.binary), "datanode", "parquetbench", "--config", str(config_toml), "--region-id", bench_target["region_id"], "--table-dir", bench_target["table_dir"], "--file-id", bench_target["file_id"], "--scan-config", str(scan_json), "--path-type", bench_target["path_type"], "--iterations", iterations, "--reader", str(read_bench["parquet_reader"])]
|
||||
cmd = [str(bench_binary), "datanode", "parquetbench", "--config", str(config_toml), "--region-id", bench_target["region_id"], "--table-dir", bench_target["table_dir"], "--file-id", bench_target["file_id"], "--scan-config", str(scan_json), "--path-type", bench_target["path_type"], "--iterations", iterations, "--reader", str(read_bench["parquet_reader"])]
|
||||
commands.append(cmd)
|
||||
parquet_runs.append({**bench_target, "cmd": cmd, "status": "dry-run" if dry_run else "planned"})
|
||||
regions: dict[tuple[str, str, str], list[str]] = {}
|
||||
@@ -1000,7 +1000,7 @@ def run_read_bench(target: RunTarget, read_bench: dict[str, Any] | None, storage
|
||||
for bench_target in bench_targets:
|
||||
regions.setdefault((bench_target["table_dir"], bench_target["region_id"], bench_target["path_type"]), []).append(bench_target["relative_path"])
|
||||
for (table_dir, region_id, path_type), region_files in regions.items():
|
||||
cmd = [str(target.binary), "datanode", "scanbench", "--config", str(config_toml), "--region-id", region_id, "--table-dir", table_dir, "--scan-config", str(scan_json), "--path-type", path_type, "--scanner", str(read_bench["scan_scanner"]), "--parallelism", str(int(read_bench["parallelism"])), "--iterations", iterations]
|
||||
cmd = [str(bench_binary), "datanode", "scanbench", "--config", str(config_toml), "--region-id", region_id, "--table-dir", table_dir, "--scan-config", str(scan_json), "--path-type", path_type, "--scanner", str(read_bench["scan_scanner"]), "--parallelism", str(int(read_bench["parallelism"])), "--iterations", iterations]
|
||||
commands.append(cmd)
|
||||
scan_runs.append({"table_dir": table_dir, "region_id": region_id, "path_type": path_type, "files": region_files, "cmd": cmd, "status": "dry-run" if dry_run else "planned"})
|
||||
if dry_run:
|
||||
@@ -1265,7 +1265,7 @@ def run_remote_write_scenario(args: argparse.Namespace, case: dict[str, Any], ca
|
||||
if storage:
|
||||
storage_inspection = run_storage_inspection(helper or args.storage_inspector, target, storage, dry_run=args.dry_run)
|
||||
storage_results.append(storage_inspection)
|
||||
read_bench_result = run_read_bench(target, remote["read_bench"], storage_inspection, dry_run=args.dry_run)
|
||||
read_bench_result = run_read_bench(args.candidate_bin, target, remote["read_bench"], storage_inspection, dry_run=args.dry_run)
|
||||
if not args.dry_run:
|
||||
query_result = run_queries(target, case, tables, args.http_timeout)
|
||||
tr = {"name": target.name, "binary": str(target.binary), "work_dir": str(target.work_dir), "components": cluster.component_report(), "frontend_config": str(config_path), "create_database": create_database, "remote_write": rw, "flushes": flushes, "flush": flushes[-1] if flushes else None, "visibility": visibility, **query_result}
|
||||
|
||||
Reference in New Issue
Block a user