Skip to content

Commit 2ee0413

Browse files
committed
Removing confluence references
1 parent 3467b62 commit 2ee0413

7 files changed

Lines changed: 87 additions & 70 deletions

‎private-cicd/benchmark/ontap/AGENTS.md‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,23 @@
1818
-->
1919
# ONTAP scale benchmark
2020

21-
- Refer to the scale matrix from `README.md` and `USAGE.md` only.
21+
Scale matrix: [ONTAP Plugin - CloudStack Operations, Scale & Parallel Test Matrix](https://netapp.atlassian.net/wiki/spaces/OSSG/pages/608854350).
22+
23+
Test ids written to the CSVs and report map to the page sections as follows:
24+
25+
| Test id | Page section | What it measures |
26+
|---|---|---|
27+
| `pool_sequential_create` | 5.1.1 | Sequential create (1 pool at a time, cumulative to N) |
28+
| `pool_sequential_delete` | 5.1.2 | Sequential delete (1 pool at a time, from N remaining) |
29+
| `pool_concurrent_create` | 6.1.1 | Parallel pool creation |
30+
| `pool_concurrent_delete` | 6.1.2 | Parallel pool deletion |
31+
| `vm_sequential_create` | 5.2.1 | Sequential create (1 VM at a time, cumulative to N) |
32+
| `vm_sequential_delete` | 5.2.2 | Sequential delete (1 VM at a time, from N remaining) |
33+
| `vm_concurrent_create` | 6.2.1 | Parallel VM creation |
34+
| `vm_concurrent_delete` | 6.2.2 | Parallel VM deletion |
35+
| Report "Results log" table | 9 | Results log |
36+
37+
Keep section numbers and the page link out of the code. How to run each script is in `README.md` and `USAGE.md`.
2238
- Protocols, checkpoints, and concurrency levels live in `config.yaml`. `run.py` is the entry point. Do not add a CLI flag for a field that already exists in config.
2339
- Use `benchmark_support` for run ids, resource names, `mean_seconds`, and logging. Sequential and concurrency scripts must use the same helpers and the same log format. Do not hand-roll a second average or a second logger.
2440
- Run ids are letters, digits, and underscores. Storage pool names disallow `-`. VM hostnames disallow `_`; `format_vm_name` / `vm_name_token` are the only rewrite, and cleanup must use them so created VMs are the ones deleted.

‎private-cicd/benchmark/ontap/benchmark_storage_pool_concurrency.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
Concurrency storage-pool benchmark for the NetApp ONTAP CloudStack plugin.
2020
2121
Drives createStoragePool / deleteStoragePool in parallel (ThreadPoolExecutor)
22-
over the CloudStack HTTP/REST API and reproduces Section 6.1 - Parallel/
23-
Concurrency Matrix (C = 2,5,10,20,30 workers):
22+
over the CloudStack HTTP/REST API. Concurrency levels come from config.yaml:
2423
25-
6.1.1 Parallel pool creation
26-
6.1.2 Parallel pool deletion
24+
Parallel pool creation
25+
Parallel pool deletion
2726
2827
See benchmark_storage_pool_sequential.py for the sequential scale matrix
2928
(kept as a separate script/entry point on purpose - concurrency runs are the
@@ -79,7 +78,7 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
7978
prefix = cfg["benchmark"]["pool_name_prefix"]
8079

8180
for level in levels:
82-
log.info("[6.1.1] Parallel CREATE protocol=%s C=%s", protocol_key, level)
81+
log.info("Parallel pool create protocol=%s concurrency=%s", protocol_key, level)
8382
names = [format_pool_name(prefix, protocol_key, run_id, i, concurrency_level=level)
8483
for i in range(1, level + 1)]
8584

@@ -95,14 +94,14 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
9594
wall = time.perf_counter() - t0
9695

9796
for idx, r in enumerate(results, start=1):
98-
raw_logger.log(run_id, "concurrent_create", "6.1.1", protocol_key, level, idx, r)
97+
raw_logger.log(run_id, "concurrent_create", "pool_concurrent_create", protocol_key, level, idx, r)
9998

10099
succ = [r for r in results if r.success]
101100
fail = [r for r in results if not r.success]
102101
avg = mean_seconds([r.duration_sec for r in succ])
103102
notes = "Watch mgmt-server job-queue/thread-pool saturation as a confound" if level >= 30 else ""
104103
summary_rows.append({
105-
"run_id": run_id, "phase": "concurrent_create", "test_id": "6.1.1",
104+
"run_id": run_id, "phase": "concurrent_create", "test_id": "pool_concurrent_create",
106105
"protocol": protocol_key, "checkpoint": level,
107106
"total_time_sec": round(wall, 3), "avg_time_sec": round(avg, 3),
108107
"success_count": len(succ), "failure_count": len(fail), "notes": notes,
@@ -114,7 +113,7 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
114113
for r in fail:
115114
log.error("%s: %s", r.pool_name, r.error)
116115

117-
log.info("[6.1.2] Parallel DELETE protocol=%s C=%s", protocol_key, len(succ))
116+
log.info("Parallel pool delete protocol=%s concurrency=%s", protocol_key, len(succ))
118117
t0 = time.perf_counter()
119118
del_results = []
120119
if dry_run:
@@ -127,13 +126,13 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
127126
wall_del = time.perf_counter() - t0
128127

129128
for idx, r in enumerate(del_results, start=1):
130-
raw_logger.log(run_id, "concurrent_delete", "6.1.2", protocol_key, level, idx, r)
129+
raw_logger.log(run_id, "concurrent_delete", "pool_concurrent_delete", protocol_key, level, idx, r)
131130

132131
succ_d = [r for r in del_results if r.success]
133132
fail_d = [r for r in del_results if not r.success]
134133
avg_d = mean_seconds([r.duration_sec for r in succ_d])
135134
summary_rows.append({
136-
"run_id": run_id, "phase": "concurrent_delete", "test_id": "6.1.2",
135+
"run_id": run_id, "phase": "concurrent_delete", "test_id": "pool_concurrent_delete",
137136
"protocol": protocol_key, "checkpoint": level,
138137
"total_time_sec": round(wall_del, 3), "avg_time_sec": round(avg_d, 3),
139138
"success_count": len(succ_d), "failure_count": len(fail_d), "notes": "",

‎private-cicd/benchmark/ontap/benchmark_storage_pool_sequential.py‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
Sequential storage-pool benchmark for the NetApp ONTAP CloudStack plugin.
2020
2121
Drives createStoragePool / deleteStoragePool one at a time over the CloudStack
22-
HTTP/REST API and reproduces Section 5.1 - Sequential Scale Matrix
23-
(N = 1,5,10,20,30):
22+
HTTP/REST API. Checkpoints come from config.yaml:
2423
25-
5.1.1 Sequential create (1 pool at a time, cumulative to N)
26-
5.1.2 Sequential delete (1 pool at a time, from N remaining)
24+
Sequential create (1 pool at a time, cumulative to N)
25+
Sequential delete (1 pool at a time, from N remaining)
2726
2827
See benchmark_storage_pool_concurrency.py for the parallel/concurrency matrix
2928
(kept as a separate script/entry point on purpose, so a sequential run can be
@@ -80,11 +79,11 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
8079

8180
created = []
8281
create_durations = []
83-
log.info("[5.1.1] Sequential CREATE protocol=%s up to N=%s", protocol_key, max_n)
82+
log.info("Sequential pool create protocol=%s up to N=%s", protocol_key, max_n)
8483
for i in range(1, max_n + 1):
8584
name = format_pool_name(prefix, protocol_key, run_id, i)
8685
result = fake_create(name) if dry_run else create_pool(client, name, infra, ontap_cfg)
87-
raw_logger.log(run_id, "sequential_create", "5.1.1", protocol_key, max_n, i, result)
86+
raw_logger.log(run_id, "sequential_create", "pool_sequential_create", protocol_key, max_n, i, result)
8887
status = "OK" if result.success else "FAIL"
8988
log.info("[%s/%s] create %s -> %s (%.3fs)", i, max_n, name, status, result.duration_sec)
9089
if result.success:
@@ -96,7 +95,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
9695
total = sum(create_durations)
9796
avg = mean_seconds(create_durations)
9897
summary_rows.append({
99-
"run_id": run_id, "phase": "sequential_create", "test_id": "5.1.1",
98+
"run_id": run_id, "phase": "sequential_create", "test_id": "pool_sequential_create",
10099
"protocol": protocol_key, "checkpoint": i,
101100
"total_time_sec": round(total, 3), "avg_time_sec": round(avg, 3),
102101
"success_count": len(created), "failure_count": i - len(created), "notes": "",
@@ -109,10 +108,10 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
109108
time.sleep(delay)
110109

111110
total_created = len(created)
112-
log.info("[5.1.2] Sequential DELETE protocol=%s from N=%s remaining", protocol_key, total_created)
111+
log.info("Sequential pool delete protocol=%s from N=%s remaining", protocol_key, total_created)
113112
if total_created in checkpoints:
114113
summary_rows.append({
115-
"run_id": run_id, "phase": "sequential_delete", "test_id": "5.1.2",
114+
"run_id": run_id, "phase": "sequential_delete", "test_id": "pool_sequential_delete",
116115
"protocol": protocol_key, "checkpoint": total_created,
117116
"total_time_sec": 0, "avg_time_sec": 0, "success_count": 0, "failure_count": 0,
118117
"notes": "baseline - no deletes issued yet",
@@ -122,7 +121,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
122121
for idx, (name, pool_id) in enumerate(created, start=1):
123122
result = fake_delete(pool_id, name) if dry_run else delete_pool(client, pool_id, name)
124123
remaining = total_created - idx
125-
raw_logger.log(run_id, "sequential_delete", "5.1.2", protocol_key, total_created, idx, result)
124+
raw_logger.log(run_id, "sequential_delete", "pool_sequential_delete", protocol_key, total_created, idx, result)
126125
status = "OK" if result.success else "FAIL"
127126
log.info(
128127
"[%s/%s] delete %s -> %s (%.3fs) remaining=%s",
@@ -137,7 +136,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
137136
total = sum(delete_durations)
138137
avg = mean_seconds(delete_durations)
139138
summary_rows.append({
140-
"run_id": run_id, "phase": "sequential_delete", "test_id": "5.1.2",
139+
"run_id": run_id, "phase": "sequential_delete", "test_id": "pool_sequential_delete",
141140
"protocol": protocol_key, "checkpoint": remaining,
142141
"total_time_sec": round(total, 3), "avg_time_sec": round(avg, 3),
143142
"success_count": deleted_ok, "failure_count": idx - deleted_ok, "notes": "",

‎private-cicd/benchmark/ontap/benchmark_vm_instance_combined.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
Combined (sequential + concurrency) VM-instance benchmark for the NetApp
2020
ONTAP CloudStack plugin.
2121
22-
Convenience wrapper that runs benchmark_vm_instance_sequential.py's Section
23-
5.2 scale matrix immediately followed by benchmark_vm_instance_concurrency.py's
24-
Section 6.2 parallel matrix, for each protocol, under a single shared
22+
Convenience wrapper that runs benchmark_vm_instance_sequential.py's sequential
23+
scale matrix immediately followed by benchmark_vm_instance_concurrency.py's
24+
parallel matrix, for each protocol, under a single shared
2525
--run-id - equivalent to running both scripts back to back, but in one
2626
invocation and one combined results/summary_vm_<run_id>.csv.
2727
2828
Prefer the two standalone scripts (benchmark_vm_instance_sequential.py /
2929
benchmark_vm_instance_concurrency.py) when you want to review the sequential
3030
results before deciding whether to proceed with a concurrency run - this
3131
combined script is for when you already trust the config/environment and just
32-
want the full 5.2.x + 6.2.x matrix in one go.
32+
want the full sequential and parallel matrix in one go.
3333
3434
Protocols and concurrency levels come from config.yaml. Prefer run.py.
3535

‎private-cicd/benchmark/ontap/benchmark_vm_instance_concurrency.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
Drives deployVirtualMachine / destroyVirtualMachine in parallel
2222
(ThreadPoolExecutor) over the CloudStack HTTP/REST API against pre-
2323
provisioned bench_vm_nfs3 / bench_vm_iscsi storage pools (see README.md
24-
"VM instance benchmark prerequisites") and reproduces Section 6.2 - Parallel/
25-
Concurrency Matrix:
24+
"VM instance benchmark prerequisites"). Concurrency levels come from config.yaml:
2625
27-
6.2.1 Parallel VM creation
28-
6.2.2 Parallel VM deletion
26+
Parallel VM creation
27+
Parallel VM deletion
2928
3029
Each deployed VM gets a root disk (from the service offering) AND one data
3130
disk (from the disk offering) landing on the SAME tagged storage pool.
@@ -87,7 +86,7 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
8786
prefix = vm_cfg["vm_name_prefix"]
8887

8988
for level in levels:
90-
log.info("[6.2.1] Parallel CREATE protocol=%s C=%s", protocol_key, level)
89+
log.info("Parallel VM create protocol=%s concurrency=%s", protocol_key, level)
9190
names = [format_vm_name(prefix, protocol_key, run_id, i, concurrency_level=level)
9291
for i in range(1, level + 1)]
9392

@@ -103,14 +102,14 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
103102
wall = time.perf_counter() - t0
104103

105104
for idx, r in enumerate(results, start=1):
106-
raw_logger.log(run_id, "concurrent_create", "6.2.1", protocol_key, level, idx, r)
105+
raw_logger.log(run_id, "concurrent_create", "vm_concurrent_create", protocol_key, level, idx, r)
107106

108107
succ = [r for r in results if r.success]
109108
fail = [r for r in results if not r.success]
110109
avg = mean_seconds([r.duration_sec for r in succ])
111110
notes = "Watch mgmt-server job-queue/thread-pool + single-host KVM saturation as a confound" if level >= 20 else ""
112111
summary_rows.append({
113-
"run_id": run_id, "phase": "concurrent_create", "test_id": "6.2.1",
112+
"run_id": run_id, "phase": "concurrent_create", "test_id": "vm_concurrent_create",
114113
"protocol": protocol_key, "checkpoint": level,
115114
"total_time_sec": round(wall, 3), "avg_time_sec": round(avg, 3),
116115
"success_count": len(succ), "failure_count": len(fail), "notes": notes,
@@ -122,7 +121,7 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
122121
for r in fail:
123122
log.error("%s: %s", r.vm_name, r.error)
124123

125-
log.info("[6.2.2] Parallel DELETE protocol=%s C=%s", protocol_key, len(succ))
124+
log.info("Parallel VM delete protocol=%s concurrency=%s", protocol_key, len(succ))
126125
t0 = time.perf_counter()
127126
del_results = []
128127
if dry_run:
@@ -135,13 +134,13 @@ def run_concurrency(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
135134
wall_del = time.perf_counter() - t0
136135

137136
for idx, r in enumerate(del_results, start=1):
138-
raw_logger.log(run_id, "concurrent_delete", "6.2.2", protocol_key, level, idx, r)
137+
raw_logger.log(run_id, "concurrent_delete", "vm_concurrent_delete", protocol_key, level, idx, r)
139138

140139
succ_d = [r for r in del_results if r.success]
141140
fail_d = [r for r in del_results if not r.success]
142141
avg_d = mean_seconds([r.duration_sec for r in succ_d])
143142
summary_rows.append({
144-
"run_id": run_id, "phase": "concurrent_delete", "test_id": "6.2.2",
143+
"run_id": run_id, "phase": "concurrent_delete", "test_id": "vm_concurrent_delete",
145144
"protocol": protocol_key, "checkpoint": level,
146145
"total_time_sec": round(wall_del, 3), "avg_time_sec": round(avg_d, 3),
147146
"success_count": len(succ_d), "failure_count": len(fail_d), "notes": "",

‎private-cicd/benchmark/ontap/benchmark_vm_instance_sequential.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
2121
Drives deployVirtualMachine / destroyVirtualMachine one at a time over the
2222
CloudStack HTTP/REST API against pre-provisioned bench_vm_nfs3 / bench_vm_iscsi
23-
storage pools (see README.md "VM instance benchmark prerequisites") and
24-
reproduces Section 5.2 - Sequential Scale Matrix:
23+
storage pools (see README.md "VM instance benchmark prerequisites").
24+
Checkpoints come from config.yaml:
2525
26-
5.2.1 Sequential create (1 VM at a time, cumulative to N)
27-
5.2.2 Sequential delete (1 VM at a time, from N remaining)
26+
Sequential create (1 VM at a time, cumulative to N)
27+
Sequential delete (1 VM at a time, from N remaining)
2828
2929
Each deployed VM gets a root disk (from the service offering) AND one data
3030
disk (from the disk offering) landing on the SAME tagged storage pool.
@@ -86,11 +86,11 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
8686

8787
created = []
8888
create_durations = []
89-
log.info("[5.2.1] Sequential CREATE protocol=%s up to N=%s", protocol_key, max_n)
89+
log.info("Sequential VM create protocol=%s up to N=%s", protocol_key, max_n)
9090
for i in range(1, max_n + 1):
9191
name = format_vm_name(prefix, protocol_key, run_id, i)
9292
result = fake_create(name) if dry_run else deploy_vm(client, name, infra, vm_cfg, proto_cfg)
93-
raw_logger.log(run_id, "sequential_create", "5.2.1", protocol_key, max_n, i, result)
93+
raw_logger.log(run_id, "sequential_create", "vm_sequential_create", protocol_key, max_n, i, result)
9494
status = "OK" if result.success else "FAIL"
9595
log.info("[%s/%s] create %s -> %s (%.3fs)", i, max_n, name, status, result.duration_sec)
9696
if result.success:
@@ -102,7 +102,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
102102
total = sum(create_durations)
103103
avg = mean_seconds(create_durations)
104104
summary_rows.append({
105-
"run_id": run_id, "phase": "sequential_create", "test_id": "5.2.1",
105+
"run_id": run_id, "phase": "sequential_create", "test_id": "vm_sequential_create",
106106
"protocol": protocol_key, "checkpoint": i,
107107
"total_time_sec": round(total, 3), "avg_time_sec": round(avg, 3),
108108
"success_count": len(created), "failure_count": i - len(created), "notes": "",
@@ -115,10 +115,10 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
115115
time.sleep(delay)
116116

117117
total_created = len(created)
118-
log.info("[5.2.2] Sequential DELETE protocol=%s from N=%s remaining", protocol_key, total_created)
118+
log.info("Sequential VM delete protocol=%s from N=%s remaining", protocol_key, total_created)
119119
if total_created in checkpoints:
120120
summary_rows.append({
121-
"run_id": run_id, "phase": "sequential_delete", "test_id": "5.2.2",
121+
"run_id": run_id, "phase": "sequential_delete", "test_id": "vm_sequential_delete",
122122
"protocol": protocol_key, "checkpoint": total_created,
123123
"total_time_sec": 0, "avg_time_sec": 0, "success_count": 0, "failure_count": 0,
124124
"notes": "baseline - no deletes issued yet",
@@ -128,7 +128,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
128128
for idx, (name, vm_id) in enumerate(created, start=1):
129129
result = fake_delete(vm_id, name) if dry_run else destroy_vm(client, vm_id, name)
130130
remaining = total_created - idx
131-
raw_logger.log(run_id, "sequential_delete", "5.2.2", protocol_key, total_created, idx, result)
131+
raw_logger.log(run_id, "sequential_delete", "vm_sequential_delete", protocol_key, total_created, idx, result)
132132
status = "OK" if result.success else "FAIL"
133133
log.info(
134134
"[%s/%s] delete %s -> %s (%.3fs) remaining=%s",
@@ -143,7 +143,7 @@ def run_sequential(client, cfg, protocol_key, run_id, raw_logger, summary_rows,
143143
total = sum(delete_durations)
144144
avg = mean_seconds(delete_durations)
145145
summary_rows.append({
146-
"run_id": run_id, "phase": "sequential_delete", "test_id": "5.2.2",
146+
"run_id": run_id, "phase": "sequential_delete", "test_id": "vm_sequential_delete",
147147
"protocol": protocol_key, "checkpoint": remaining,
148148
"total_time_sec": round(total, 3), "avg_time_sec": round(avg, 3),
149149
"success_count": deleted_ok, "failure_count": idx - deleted_ok, "notes": "",

0 commit comments

Comments
 (0)