diff --git a/scripts/run_pinned_paired_abba_bench.sh b/scripts/run_pinned_paired_abba_bench.sh index 72181a7f5..3c5efb562 100755 --- a/scripts/run_pinned_paired_abba_bench.sh +++ b/scripts/run_pinned_paired_abba_bench.sh @@ -243,21 +243,18 @@ build_runner_cmd_for_product() { local bucket="$3" local leg_out_dir="$4" local endpoint image_ref image_digest revision_or_release ack_contract - local -a node_args if [[ "$product" == "rustfs" ]]; then endpoint="$RUSTFS_ENDPOINT" image_ref="$RUSTFS_IMAGE_REF" image_digest="$RUSTFS_IMAGE_DIGEST" revision_or_release="$RUSTFS_REVISION" ack_contract="$RUSTFS_ACK_CONTRACT" - node_args=("${RUSTFS_NODE_ARGS[@]}") else endpoint="$MINIO_ENDPOINT" image_ref="$MINIO_IMAGE_REF" image_digest="$MINIO_IMAGE_DIGEST" revision_or_release="$MINIO_RELEASE" ack_contract="$MINIO_ACK_CONTRACT" - node_args=("${MINIO_NODE_ARGS[@]}") fi RUNNER_CMD=( @@ -286,7 +283,14 @@ build_runner_cmd_for_product() { --bucket "$bucket" \ --out-dir "$leg_out_dir" ) - RUNNER_CMD+=("${COMMON_LABELS[@]}" "${node_args[@]}") + if ((${#COMMON_LABELS[@]} > 0)); then + RUNNER_CMD+=("${COMMON_LABELS[@]}") + fi + if [[ "$product" == "rustfs" && ${#RUSTFS_NODE_ARGS[@]} -gt 0 ]]; then + RUNNER_CMD+=("${RUSTFS_NODE_ARGS[@]}") + elif [[ "$product" == "minio" && ${#MINIO_NODE_ARGS[@]} -gt 0 ]]; then + RUNNER_CMD+=("${MINIO_NODE_ARGS[@]}") + fi if [[ "$DRY_RUN" == "true" ]]; then RUNNER_CMD+=(--dry-run) fi diff --git a/scripts/test_pinned_paired_abba_bench.sh b/scripts/test_pinned_paired_abba_bench.sh index f462afeb0..73c82b10f 100755 --- a/scripts/test_pinned_paired_abba_bench.sh +++ b/scripts/test_pinned_paired_abba_bench.sh @@ -34,6 +34,26 @@ if "$RUNNER" \ exit 1 fi +"$RUNNER" \ + --access-key minioadmin \ + --secret-key minioadmin \ + --rustfs-endpoint http://127.0.0.1:9000 \ + --rustfs-image-ref rustfs/rustfs:bench \ + --rustfs-image-digest sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef \ + --rustfs-revision 42fc84063 \ + --rustfs-ack-contract relaxed \ + --minio-endpoint http://127.0.0.1:9100 \ + --minio-image-ref quay.io/minio/minio:RELEASE.2025-07-18T21-56-31Z \ + --minio-image-digest sha256:1111222233334444111122223333444411112222333344441111222233334444 \ + --minio-release RELEASE.2025-07-18T21-56-31Z \ + --minio-ack-contract strict \ + --concurrencies 1 \ + --sizes 1048576B \ + --rounds-per-leg 1 \ + --cooldown-secs 0 \ + --out-dir "$TMP_DIR/good-no-optional-arrays" \ + --dry-run >"$TMP_DIR/dry-run-no-optional-arrays.log" + "$RUNNER" \ --access-key minioadmin \ --secret-key minioadmin \