Skip to content

Commit 02125ed

Browse files
committed
[benchmark] Skip broken benchmark on 8 cores.
This change skips one specific benchmark on 8 cores that only passes on 30 cores. The benchmark hangs and does not complete when run on the 8-core node pool. The 30-core node pool has `c2-standard-30` nodes, compared to `e2-standard-8` for the 8-core node pool. With this change, all benchmarks on both node pools should be passing.
1 parent 9b77138 commit 02125ed

File tree

2 files changed

+60
-4
lines changed

2 files changed

+60
-4
lines changed

tools/internal_ci/linux/grpc_e2e_performance_gke.sh

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,24 @@ buildConfigs() {
120120
-o "loadtest_with_prebuilt_workers_${pool}.yaml"
121121
}
122122

123+
# Regex to disable specific tests.
124+
# https://stackoverflow.com/questions/406230
125+
disableTestsRegex() {
126+
if (($# == 0)); then
127+
echo '.*'
128+
return
129+
fi
130+
local s='^((?!'+"$1"
131+
shift
132+
while (($# > 0)); do
133+
s+='|'
134+
s+="$1"
135+
shift
136+
done
137+
s+=').)*$'
138+
echo "${s}"
139+
}
140+
123141
# List all languages.
124142
declare -A useLanguage=(
125143
[c++]=1
@@ -190,8 +208,18 @@ if [[ -v "useLanguage[ruby]" ]]; then
190208
runnerLangArgs+=(-l "ruby:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}")
191209
fi
192210

193-
buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}"
194-
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}"
211+
# Disable broken tests by regex.
212+
declare -a disabledTests8core=(
213+
cpp_protobuf_async_client_unary_1channel_64wide_128breq_8mbresp_insecure
214+
)
215+
declare -a disabledTests32core=()
216+
217+
# Arguments to disable tests.
218+
regexArgs8core=(-r "$(disabledTestsRegex "${disabledTests8core[@]}")")
219+
regexArgs32core=(-r "$(disabledTestsRegex "${disabledTests32core[@]}")")
220+
221+
buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}" "${regexArgs8core[@]}"
222+
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}" "${regexArgs32core[@]}"
195223

196224
# Delete prebuilt images on exit.
197225
deleteImages() {

tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,24 @@ buildConfigs() {
115115
-o "loadtest_with_prebuilt_workers_${pool}.yaml"
116116
}
117117

118+
# Regex to disable specific tests.
119+
# https://stackoverflow.com/questions/406230
120+
disableTestsRegex() {
121+
if (($# == 0)); then
122+
echo '.*'
123+
return
124+
fi
125+
local s='^((?!'+"$1"
126+
shift
127+
while (($# > 0)); do
128+
s+='|'
129+
s+="$1"
130+
shift
131+
done
132+
s+=').)*$'
133+
echo "${s}"
134+
}
135+
118136
# List all languages.
119137
declare -A useLanguage=(
120138
[c++]=1
@@ -185,8 +203,18 @@ if [[ -v "useLanguage[ruby]" ]]; then
185203
runnerLangArgs+=(-l "ruby:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}")
186204
fi
187205

188-
buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}"
189-
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}"
206+
# Disable broken tests by regex.
207+
declare -a disabledTests8core=(
208+
cpp_protobuf_async_client_unary_1channel_64wide_128breq_8mbresp_insecure
209+
)
210+
declare -a disabledTests32core=()
211+
212+
# Arguments to disable tests.
213+
regexArgs8core=(-r "$(disabledTestsRegex "${disabledTests8core[@]}")")
214+
regexArgs32core=(-r "$(disabledTestsRegex "${disabledTests32core[@]}")")
215+
216+
buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}" "${regexArgs8core[@]}"
217+
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}" "${regexArgs32core[@]}"
190218

191219
# Delete prebuilt images on exit.
192220
deleteImages() {

0 commit comments

Comments
 (0)