Skip to content

Commit

Permalink
[benchmark] Skip broken benchmark on 8 cores.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
paulosjca committed Dec 27, 2024
1 parent 9b77138 commit 02125ed
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 4 deletions.
32 changes: 30 additions & 2 deletions tools/internal_ci/linux/grpc_e2e_performance_gke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,24 @@ buildConfigs() {
-o "loadtest_with_prebuilt_workers_${pool}.yaml"
}

# Regex to disable specific tests.
# https://stackoverflow.com/questions/406230
disableTestsRegex() {
if (($# == 0)); then
echo '.*'
return
fi
local s='^((?!'+"$1"
shift
while (($# > 0)); do
s+='|'
s+="$1"
shift
done
s+=').)*$'
echo "${s}"
}

# List all languages.
declare -A useLanguage=(
[c++]=1
Expand Down Expand Up @@ -190,8 +208,18 @@ if [[ -v "useLanguage[ruby]" ]]; then
runnerLangArgs+=(-l "ruby:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}")
fi

buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}"
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}"
# Disable broken tests by regex.
declare -a disabledTests8core=(
cpp_protobuf_async_client_unary_1channel_64wide_128breq_8mbresp_insecure
)
declare -a disabledTests32core=()

# Arguments to disable tests.
regexArgs8core=(-r "$(disabledTestsRegex "${disabledTests8core[@]}")")
regexArgs32core=(-r "$(disabledTestsRegex "${disabledTests32core[@]}")")

buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}" "${regexArgs8core[@]}"
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}" "${regexArgs32core[@]}"

# Delete prebuilt images on exit.
deleteImages() {
Expand Down
32 changes: 30 additions & 2 deletions tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,24 @@ buildConfigs() {
-o "loadtest_with_prebuilt_workers_${pool}.yaml"
}

# Regex to disable specific tests.
# https://stackoverflow.com/questions/406230
disableTestsRegex() {
if (($# == 0)); then
echo '.*'
return
fi
local s='^((?!'+"$1"
shift
while (($# > 0)); do
s+='|'
s+="$1"
shift
done
s+=').)*$'
echo "${s}"
}

# List all languages.
declare -A useLanguage=(
[c++]=1
Expand Down Expand Up @@ -185,8 +203,18 @@ if [[ -v "useLanguage[ruby]" ]]; then
runnerLangArgs+=(-l "ruby:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}")
fi

buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}"
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}"
# Disable broken tests by regex.
declare -a disabledTests8core=(
cpp_protobuf_async_client_unary_1channel_64wide_128breq_8mbresp_insecure
)
declare -a disabledTests32core=()

# Arguments to disable tests.
regexArgs8core=(-r "$(disabledTestsRegex "${disabledTests8core[@]}")")
regexArgs32core=(-r "$(disabledTestsRegex "${disabledTests32core[@]}")")

buildConfigs "${WORKER_POOL_8CORE}" "${BIGQUERY_TABLE_8CORE}" "${configLangArgs8core[@]}" "${regexArgs8core[@]}"
buildConfigs "${WORKER_POOL_32CORE}" "${BIGQUERY_TABLE_32CORE}" "${configLangArgs32core[@]}" "${regexArgs32core[@]}"

# Delete prebuilt images on exit.
deleteImages() {
Expand Down

0 comments on commit 02125ed

Please sign in to comment.