From b17c61d4a50621cff7d141f4a25ffaa3de0538c5 Mon Sep 17 00:00:00 2001 From: Joe Talerico Date: Tue, 8 Dec 2015 13:36:27 -0500 Subject: [PATCH] Organize the workload runners into their own subdir --- browbeat-config | 38 +++++++++++++ browbeat.sh | 55 +++---------------- {keystone => rally/keystone}/README.md | 0 {keystone => rally/keystone}/keystone-cc | 0 {keystone => rally/keystone}/neutron-cc | 0 {keystone => rally/keystone}/nova-cc | 0 {neutron => rally/neutron}/README.md | 0 {nova => rally/nova}/README.md | 0 {nova => rally/nova}/nova-boot-list-cc | 0 .../rally-plugins}/README.md | 0 .../neutron-netcreate_nova-boot.py | 0 .../rally-plugins}/neutron-plugin.json | 0 .../rally-neutron/admintenant-env.json | 0 13 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 browbeat-config rename {keystone => rally/keystone}/README.md (100%) rename {keystone => rally/keystone}/keystone-cc (100%) rename {keystone => rally/keystone}/neutron-cc (100%) rename {keystone => rally/keystone}/nova-cc (100%) rename {neutron => rally/neutron}/README.md (100%) rename {nova => rally/nova}/README.md (100%) rename {nova => rally/nova}/nova-boot-list-cc (100%) rename {rally-plugins => rally/rally-plugins}/README.md (100%) rename {rally-plugins => rally/rally-plugins}/neutron-netcreate_nova-boot.py (100%) rename {rally-plugins => rally/rally-plugins}/neutron-plugin.json (100%) rename {rally-plugins => rally/rally-plugins}/rally-neutron/admintenant-env.json (100%) diff --git a/browbeat-config b/browbeat-config new file mode 100644 index 000000000..74d42ab40 --- /dev/null +++ b/browbeat-config @@ -0,0 +1,38 @@ +DEBUG=true +CONNMON=true +# Number of workers to test. This is a loop. +NUM_WORKERS="36 32 24 12 6" +RESET_WORKERS="24" +CONNMON_PID=0 +# Number of times we should rerun a Rally Scenario +RERUN=3 +CONTROLLERS=$(nova list | grep control) +PBENCH=true +PBENCH_INTERVAL=2 +SSH_OPTS="StrictHostKeyChecking no" + +# Keystone is running in Apache (httpd) rather than as openstack-keystone (Eventlet) +KEYSTONE_IN_APACHE=false + +declare -A WORKERS +WORKERS["keystone"]="public_workers|admin_workers" +if [[ "${KEYSTONE_IN_APACHE}" == true ]]; then + WORKERS["keystone"]="processes" +fi +WORKERS["nova"]="metadata_workers|osapi_compute_workers|ec2_workers|workers|#workers" +WORKERS["neutron"]="rpc_workers|api_workers" + +declare -A TIMES +TIMES["keystone"]=5000 +TIMES["nova"]=128 + +declare -A CONCURRENCY +CONCURRENCY["keystone"]="64 96 128 160 192 224 256" +CONCURRENCY["nova"]="8 16 32 48 54" + +ROOT=false +LOGIN_USER="heat-admin" +if [[ $(whoami) == "root" ]]; then + LOGIN_USER="root" + ROOT=true +fi diff --git a/browbeat.sh b/browbeat.sh index cb1f42b5b..0c834f502 100755 --- a/browbeat.sh +++ b/browbeat.sh @@ -1,43 +1,6 @@ #!/bin/bash source ~/stackrc -DEBUG=true -CONNMON=true -# Number of workers to test. This is a loop. -NUM_WORKERS="36 32 24 12 6" -RESET_WORKERS="24" -CONNMON_PID=0 -# Number of times we should rerun a Rally Scenario -RERUN=3 -CONTROLLERS=$(nova list | grep control) -PBENCH=true -PBENCH_INTERVAL=2 -SSH_OPTS="StrictHostKeyChecking no" - -# Keystone is running in Apache (httpd) rather than as openstack-keystone (Eventlet) -KEYSTONE_IN_APACHE=true - -declare -A WORKERS -WORKERS["keystone"]="public_workers|admin_workers" -if [[ "${KEYSTONE_IN_APACHE}" == true ]]; then - WORKERS["keystone"]="processes" -fi -WORKERS["nova"]="metadata_workers|osapi_compute_workers|ec2_workers|workers|#workers" -WORKERS["neutron"]="rpc_workers|api_workers" - -declare -A TIMES -TIMES["keystone"]=5000 -TIMES["nova"]=128 - -declare -A CONCURRENCY -CONCURRENCY["keystone"]="64 96 128 160 192 224 256" -CONCURRENCY["nova"]="8 16 32 48 54" - -ROOT=false -LOGIN_USER="heat-admin" -if [[ $(whoami) == "root" ]]; then - LOGIN_USER="root" - ROOT=true -fi +source browbeat-config log() { @@ -111,9 +74,9 @@ run_rally() test_prefix=$2 fi - for task_file in `ls ${osp_service}` + for task_file in `ls rally/${osp_service}` do - task_dir=$osp_service + task_dir=rally/$osp_service if [ ${task_file: -3} == "-cc" ] then @@ -183,17 +146,17 @@ run_rally() post_process() { if [ -z "$1" ] ; then - echo "Error result path not passed" + echo "Error result path not passed" exit 1 else log Post-Processing : $1 results=$1 fi - + if $CONNMON ; then log Building Connmon Graphs - for i in `ls -talrh $results | grep -E "*\.csv$" | awk '{print $9}'` ; do - python graphing/connmonplot.py $results/$i; + for i in `ls -talrh $results | grep -E "*\.csv$" | awk '{print $9}'` ; do + python graphing/connmonplot.py $results/$i; done fi } @@ -262,8 +225,8 @@ for num_wkrs in ${NUM_WORKERS} ; do ansible-playbook -i ansible/hosts ansible/browbeat/adjustment.yml -e "workers=${num_wkrs}" check_running_workers - check_controllers - run_rally keystone "${complete_test_prefix}-keystone-${num_wkr_padded}" ${num_wkrs} +# check_controllers +# run_rally keystone "${complete_test_prefix}-keystone-${num_wkr_padded}" ${num_wkrs} check_controllers run_rally nova "${complete_test_prefix}-nova-${num_wkr_padded}" ${num_wkrs} diff --git a/keystone/README.md b/rally/keystone/README.md similarity index 100% rename from keystone/README.md rename to rally/keystone/README.md diff --git a/keystone/keystone-cc b/rally/keystone/keystone-cc similarity index 100% rename from keystone/keystone-cc rename to rally/keystone/keystone-cc diff --git a/keystone/neutron-cc b/rally/keystone/neutron-cc similarity index 100% rename from keystone/neutron-cc rename to rally/keystone/neutron-cc diff --git a/keystone/nova-cc b/rally/keystone/nova-cc similarity index 100% rename from keystone/nova-cc rename to rally/keystone/nova-cc diff --git a/neutron/README.md b/rally/neutron/README.md similarity index 100% rename from neutron/README.md rename to rally/neutron/README.md diff --git a/nova/README.md b/rally/nova/README.md similarity index 100% rename from nova/README.md rename to rally/nova/README.md diff --git a/nova/nova-boot-list-cc b/rally/nova/nova-boot-list-cc similarity index 100% rename from nova/nova-boot-list-cc rename to rally/nova/nova-boot-list-cc diff --git a/rally-plugins/README.md b/rally/rally-plugins/README.md similarity index 100% rename from rally-plugins/README.md rename to rally/rally-plugins/README.md diff --git a/rally-plugins/neutron-netcreate_nova-boot.py b/rally/rally-plugins/neutron-netcreate_nova-boot.py similarity index 100% rename from rally-plugins/neutron-netcreate_nova-boot.py rename to rally/rally-plugins/neutron-netcreate_nova-boot.py diff --git a/rally-plugins/neutron-plugin.json b/rally/rally-plugins/neutron-plugin.json similarity index 100% rename from rally-plugins/neutron-plugin.json rename to rally/rally-plugins/neutron-plugin.json diff --git a/rally-plugins/rally-neutron/admintenant-env.json b/rally/rally-plugins/rally-neutron/admintenant-env.json similarity index 100% rename from rally-plugins/rally-neutron/admintenant-env.json rename to rally/rally-plugins/rally-neutron/admintenant-env.json