diff options
author | 2019-10-24 16:44:38 +0200 | |
---|---|---|
committer | 2019-10-24 16:45:52 +0200 | |
commit | bf354b5080c37d23db25d360849b0cc0d67962a9 (patch) | |
tree | 37574c4f29cb9879af1dc2492d518602bcbc53d5 /tools | |
parent | ec90a322ed3760284708e46c9e448d954e75d0f9 (diff) |
Reorganize deletion of completed producers
Load performance test enhancement
Change-Id: I8b87ff7fdaaa17dd69cd5136726faa45f497dc71
Issue-ID: DCAEGEN2-1881
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/performance/cloud/cloud-based-performance-test.sh | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh index 7d8c1fe2..8e2b3840 100755 --- a/tools/performance/cloud/cloud-based-performance-test.sh +++ b/tools/performance/cloud/cloud-based-performance-test.sh @@ -19,6 +19,7 @@ SCRIPT_DIRECTORY="$(pwd "$0")" CONTAINERS_COUNT=1 +COMPLETED_PRODUCERS_SUM=0 LOAD_TEST="false" PROPERTIES_FILE=${SCRIPT_DIRECTORY}/test.properties PRODUCER_APPS_LABEL=hv-collector-producer @@ -32,7 +33,7 @@ GRAFANA_DASHBOARD_PROVIDERS=grafana-dashboards-providers ONAP_NAMESPACE=onap MAXIMUM_BACK_OFF_CHECK_ITERATIONS=30 CHECK_NUMBER=0 -COMPLETED_PRODUCERS_SUM=0 +PRODUCERS_TO_RECREATE=0 NAME_REASON_PATTERN="custom-columns=NAME:.metadata.name,REASON:.status.containerStatuses[].state.waiting.reason" HVVES_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep hv-ves-collector) HVVES_CERT_PATH=/etc/ves-hv/ssl/ @@ -107,6 +108,7 @@ function generate_certs() { } function handle_backoffs() { + IMAGE_PULL_BACK_OFFS=$(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} -o ${NAME_REASON_PATTERN} | grep -c "ImagePullBackOff \| ErrImagePull") if [[ ${IMAGE_PULL_BACK_OFFS} -gt 0 ]]; then CHECK_NUMBER=$((CHECK_NUMBER + 1)) if [[ ${CHECK_NUMBER} -gt ${MAXIMUM_BACK_OFF_CHECK_ITERATIONS} ]]; then @@ -119,7 +121,9 @@ function handle_backoffs() { function handle_key_interrupt() { trap SIGINT echo "Script interrupted, attempt to delete producers" - kubectl delete pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} + echo "Wait with patience" + COMPLETED_PRODUCERS_SUM=$(($(kubectl delete pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} | grep producer | wc -l) + COMPLETED_PRODUCERS_SUM)) + echo "Total number of completed producers: ${COMPLETED_PRODUCERS_SUM}" exit 0 } @@ -215,21 +219,22 @@ function start_load_tests() { echo "Constant producer number keeper started working" while :; do - COMPLETED_PRODUCERS=$(($(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} | grep -c "Completed")-COMPLETED_PRODUCERS_SUM)) - IMAGE_PULL_BACK_OFFS=$(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} -o ${NAME_REASON_PATTERN} | grep -c "ImagePullBackOff \| ErrImagePull") - + PRODUCERS_TO_RECREATE=$((CONTAINERS_COUNT-$(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} | grep -c "Running"))) handle_backoffs set -e - for i in $(seq 1 ${COMPLETED_PRODUCERS}); + for i in $(seq 1 ${PRODUCERS_TO_RECREATE}); do - echo "Recreating ${i}/${COMPLETED_PRODUCERS} producer" + echo "Recreating ${i}/${PRODUCERS_TO_RECREATE} producer" kubectl create -f producer-pod.yaml -n ${ONAP_NAMESPACE} - COMPLETED_PRODUCERS_SUM=$((COMPLETED_PRODUCERS_SUM + 1)) done set +e + COMPLETED_PRODUCERS_SUM=$((COMPLETED_PRODUCERS_SUM + PRODUCERS_TO_RECREATE)) + echo "Attempting to clear completed producers" + kubectl delete pod --field-selector=status.phase==Succeeded -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} + [[ ${CHECK_NUMBER} -gt ${MAXIMUM_BACK_OFF_CHECK_ITERATIONS} ]] && break - sleep 2 + sleep 1 done trap SIGINT @@ -244,8 +249,6 @@ function start_performance_test() { echo "Waiting for producers completion" while :; do COMPLETED_PRODUCERS=$(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} | grep -c "Completed") - IMAGE_PULL_BACK_OFFS=$(kubectl get pods -l app=${PRODUCER_APPS_LABEL} -n ${ONAP_NAMESPACE} -o ${NAME_REASON_PATTERN} | grep -c "ImagePullBackOff \| ErrImagePull") - handle_backoffs [[ ${COMPLETED_PRODUCERS} -eq ${CONTAINERS_COUNT} || ${CHECK_NUMBER} -gt ${MAXIMUM_BACK_OFF_CHECK_ITERATIONS} ]] && break |