diff --git a/utils/touchstone-configs/mb-touchstone.json b/utils/touchstone-configs/mb-touchstone.json index f9f685db..6ce29d5a 100644 --- a/utils/touchstone-configs/mb-touchstone.json +++ b/utils/touchstone-configs/mb-touchstone.json @@ -14,8 +14,15 @@ "requests_per_second": [ "avg" ], + "avg_latency": ["avg"], "latency_95pctl": [ "avg" + ], + "200": [ + "avg" + ], + "0": [ + "avg" ] } }, @@ -32,8 +39,15 @@ "requests_per_second": [ "avg" ], + "avg_latency": ["avg"], "latency_95pctl": [ "avg" + ], + "200": [ + "avg" + ], + "0": [ + "avg" ] } }, @@ -50,8 +64,15 @@ "requests_per_second": [ "avg" ], + "avg_latency": ["avg"], "latency_95pctl": [ "avg" + ], + "200": [ + "avg" + ], + "0": [ + "avg" ] } }, @@ -68,8 +89,15 @@ "requests_per_second": [ "avg" ], + "avg_latency": ["avg"], "latency_95pctl": [ "avg" + ], + "200": [ + "avg" + ], + "0": [ + "avg" ] } }, @@ -86,8 +114,15 @@ "requests_per_second": [ "avg" ], + "avg_latency": ["avg"], "latency_95pctl": [ "avg" + ], + "200": [ + "avg" + ], + "0": [ + "avg" ] } } diff --git a/workloads/router-perf-v2/common.sh b/workloads/router-perf-v2/common.sh index 9c3e1875..7edbd6ac 100644 --- a/workloads/router-perf-v2/common.sh +++ b/workloads/router-perf-v2/common.sh @@ -24,13 +24,13 @@ get_scenario(){ if [[ ${NUM_NODES} -ge ${LARGE_SCALE_THRESHOLD} ]]; then log "Large scale scenario detected: #workers >= ${LARGE_SCALE_THRESHOLD}" export NUMBER_OF_ROUTES=${LARGE_SCALE_ROUTES:-500} - CLIENTS=${LARGE_SCALE_CLIENTS:-"1 20 80"} - CLIENTS_MIX=${LARGE_SCALE_CLIENTS_MIX:-"1 10 20"} + CLIENTS=${LARGE_SCALE_CLIENTS:-"1 80"} + CLIENTS_MIX=${LARGE_SCALE_CLIENTS_MIX:-"1 25"} else log "Small scale scenario detected: #workers < ${LARGE_SCALE_THRESHOLD}" export NUMBER_OF_ROUTES=${SMALL_SCALE_ROUTES:-100} - CLIENTS=${SMALL_SCALE_CLIENTS:-"1 40 200"} - CLIENTS_MIX=${SMALL_SCALE_CLIENTS_MIX:-"1 20 80"} + CLIENTS=${SMALL_SCALE_CLIENTS:-"1 400"} + CLIENTS_MIX=${SMALL_SCALE_CLIENTS_MIX:-"1 125"} fi }