From f41df009ee216484211be09f546964a77372be1e Mon Sep 17 00:00:00 2001 From: jeremyhi Date: Mon, 12 Oct 2026 17:41:24 +0800 Subject: [PATCH] ci: default the S3 benchmark to c6id.2xlarge c7id is not offered in the runner region ap-southeast-1, where DescribeInstanceTypes rejects it. c6id is the compute optimized x86 family with a local NVMe instance store that the region offers, with the same 8 vCPU and 16 GiB at 2xlarge. Signed-off-by: jeremyhi --- .github/workflows/oswal-s3-bench.yml | 4 ++-- tests/perf/test_oswal_s3_bench_scripts.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/oswal-s3-bench.yml b/.github/workflows/oswal-s3-bench.yml index 899f5a6411e..f92c90dfde5 100644 --- a/.github/workflows/oswal-s3-bench.yml +++ b/.github/workflows/oswal-s3-bench.yml @@ -14,9 +14,9 @@ on: type: string default: nightly instance_type: - description: EC2 instance type; the d of c7id gives a local NVMe instance store for the Raft Engine WAL + description: EC2 instance type in the bucket region; the d of c6id gives a local NVMe instance store for the Raft Engine WAL type: string - default: c7id.2xlarge + default: c6id.2xlarge concurrency: description: Comma-separated loader concurrency levels type: string diff --git a/tests/perf/test_oswal_s3_bench_scripts.py b/tests/perf/test_oswal_s3_bench_scripts.py index 26bcc443ef5..92824fdabb5 100644 --- a/tests/perf/test_oswal_s3_bench_scripts.py +++ b/tests/perf/test_oswal_s3_bench_scripts.py @@ -99,7 +99,7 @@ class PlanTest(unittest.TestCase): def test_manifest_takes_the_sha256_digest(self): plan = bench.build_plan("1,8", "2000000", "1000", "2", smoke=False) inspect = [{"RepoDigests": ["greptime/greptimedb@sha256:" + "a" * 64]}] - manifest = bench.build_manifest(plan, inspect, "runtime@sha256:" + "b" * 64, "c7id.2xlarge", + manifest = bench.build_manifest(plan, inspect, "runtime@sha256:" + "b" * 64, "c6id.2xlarge", "ap-southeast-1", "oswal-bench/1-1") self.assertEqual(manifest["greptimedb_image"], "greptime/greptimedb@sha256:" + "a" * 64) self.assertEqual((manifest["rows"], manifest["rounds"], manifest["concurrency"]), (2_000_000, 2, [1, 8])) @@ -135,7 +135,7 @@ class SummaryTest(unittest.TestCase): root = Path(directory) plan = bench.build_plan("8", "6000", "1000", "2", smoke=False) (root / "plan.json").write_text(json.dumps(plan)) - (root / "run.json").write_text(json.dumps({"rows": 6000, "batch_rows": 1000, "instance_type": "c7id.2xlarge"})) + (root / "run.json").write_text(json.dumps({"rows": 6000, "batch_rows": 1000, "instance_type": "c6id.2xlarge"})) speeds = {"1-8-R": 100.0, "1-8-D": 80.0, "1-8-E": 90.0, "2-8-E": 99.0, "2-8-D": 50.0, "2-8-R": 110.0} for cell_id, speed in speeds.items(): self.write_cell(root, cell_id, speed, metrics=ACK_BUCKETS if cell_id.endswith("D") else "")