all three profiling tests updated to generate valgrind results

Author: marc-casavant

src/tests/multi-server/scripts/profiling/start_valgrind_profiling.sh

@@ -4,9 +4,9 @@
 
 # Clear any stale marker from a previous run
 rm -f /etc/prof-results/.profiling_complete
-rm -f /etc/prof-results/start_valgrind_profiling.log
+rm -f /etc/prof-results/valgrind_profiling.log
 
-exec > /etc/prof-results/start_valgrind_profiling.log 2>&1
+exec > /etc/prof-results/valgrind_profiling.log 2>&1
 
 # Ignore SIGTERM — freeradius broadcasts it to the process group on shutdown,
 # which would otherwise kill this script before it can touch .profiling_complete
@@ -33,13 +33,13 @@ valgrind \
   --keep-debuginfo=yes \
   --instr-atstart=no \
   freeradius -f -l stdout -S resources.talloc_skip_cleanup=yes 2>&1 | \
-  tee /etc/prof-results/freeradius_profiling.log &
+  tee /etc/prof-results/freeradius.log &
 VALGRIND_PID=$!
 
 # Wait for server ready (bail out if freeradius fails to start under valgrind)
 STARTUP_TIMEOUT=300
 STARTUP_ELAPSED=0
-until grep -q "Ready to process requests" /etc/prof-results/freeradius_profiling.log; do
+until grep -q "Ready to process requests" /etc/prof-results/freeradius.log; do
   sleep 1
   STARTUP_ELAPSED=$(( STARTUP_ELAPSED + 1 ))
   if [ ${STARTUP_ELAPSED} -ge ${STARTUP_TIMEOUT} ]; then
@@ -81,7 +81,12 @@ sleep 5
 
 # Signal that valgrind has finished writing all profiling data
 echo "INFO: Profiling complete at $(date)"
-touch /etc/prof-results/.profiling_complete
 
-# Restore stdout/stderr so subsequent commands in the parent shell
+echo "INFO: running callgrind_annotate to generate report"
+#callgrind_annotate $(find /etc/prof-results -name "callgrind.out.*" -size +0c | sort) > /etc/prof-results/callgrind_report.txt
+cmd='callgrind_annotate $(find /etc/prof-results -name "callgrind.out.*" -size +0c | sort) > /etc/prof-results/callgrind_report.txt'
+echo "$cmd"
+eval "$cmd"
+
+# Restore stdout/stderr
 exec > /dev/null 2>&1

src/tests/multi-server/tests/prof-accept/short.ci.test.yml

@@ -13,7 +13,6 @@ loadgen:
   repeat: "no"
 
 # Test framework
-# state_1 must cover: valgrind startup (slow under callgrind) + SEND_DURATION sleep (30s) + callgrind dump write
 test_timeout: 125
 test_state1_verify_timeout: 120
 test_state2_verify_timeout: 30

src/tests/multi-server/tests/prof-accept/template.yml.j2

@@ -32,14 +32,6 @@ states:
 
               source /etc/freeradius/start_valgrind_profiling.sh
 
-              # Block until valgrind finishes writing all profiling data.
-              # start_valgrind_profiling.sh touches this file after `wait` returns.
-              #until [ -f /etc/prof-results/.profiling_complete ]; do sleep 5; done
-              rm -f /etc/prof-results/.profiling_complete
-
-              echo "INFO: running callgrind_annotate to generate report" | tee -a /etc/prof-results/start_valgrind_profiling.log
-              callgrind_annotate $(find /etc/prof-results -name "callgrind.out.*" -size +0c | sort) > /etc/prof-results/callgrind_report.txt
-
             detach: true
     verify:
       timeout: {{ test_state1_verify_timeout }}

src/tests/multi-server/tests/prof-ldap/short.ci.test.yml

@@ -13,6 +13,6 @@ loadgen:
   repeat: "no"
 
 # Test framework
-test_timeout: 165
-test_state1_verify_timeout: 130
-test_state2_verify_timeout: 5
+test_timeout: 125
+test_state1_verify_timeout: 120
+test_state2_verify_timeout: 30

src/tests/multi-server/tests/prof-ldap/template.yml.j2

@@ -30,32 +30,9 @@ states:
               {%- endfor %}
               printf "  NUM_MESSAGES:     %s\n" "$TEST_LOADGEN_NUM_MESSAGES"
 
-              # No profiling
-              #exec freeradius -f -l stdout
-
               source /etc/freeradius/start_valgrind_profiling.sh
 
             detach: true
-        - execute_command:
-            command: |
-              # Block until valgrind finishes writing all profiling data.
-              # start_valgrind_profiling.sh touches this file after `wait` returns.
-              until [ -f /etc/prof-results/.profiling_complete ]; do sleep 5; done
-              rm -f /etc/prof-results/.profiling_complete
     verify:
       timeout: {{ test_state1_verify_timeout }}
       trigger_mode: unordered
-  state_2:
-    description: >
-      Generate Valgrind/callgrind profiling report
-    host:
-      profiling-server:
-        actions:
-        - execute_command:
-            command: |
-              # Generate report from non-empty callgrind.out.* output files
-              cd /etc/prof-results
-              callgrind_annotate $(find . -name "callgrind.out.*" -size +0c | sort) > callgrind_report.txt
-    verify:
-      timeout: {{ test_state2_verify_timeout }}
-      trigger_mode: unordered

src/tests/multi-server/tests/prof-pap-auth/short.ci.test.yml

@@ -13,6 +13,6 @@ loadgen:
   repeat: "no"
 
 # Test framework
-test_timeout: 165
-test_state1_verify_timeout: 130
-test_state2_verify_timeout: 5
+test_timeout: 125
+test_state1_verify_timeout: 120
+test_state2_verify_timeout: 30

src/tests/multi-server/tests/prof-pap-auth/template.yml.j2

@@ -30,32 +30,9 @@ states:
               {%- endfor %}
               printf "  NUM_MESSAGES:     %s\n" "$TEST_LOADGEN_NUM_MESSAGES"
 
-              # No profiling
-              #exec freeradius -f -l stdout
-
               source /etc/freeradius/start_valgrind_profiling.sh
 
             detach: true
-        - execute_command:
-            command: |
-              # Block until valgrind finishes writing all profiling data.
-              # start_valgrind_profiling.sh touches this file after `wait` returns.
-              until [ -f /etc/prof-results/.profiling_complete ]; do sleep 5; done
-              rm -f /etc/prof-results/.profiling_complete
     verify:
       timeout: {{ test_state1_verify_timeout }}
       trigger_mode: unordered
-  state_2:
-    description: >
-      Generate Valgrind/callgrind profiling report
-    host:
-      profiling-server:
-        actions:
-        - execute_command:
-            command: |
-              # Generate report from non-empty callgrind.out.* output files
-              cd /etc/prof-results
-              callgrind_annotate $(find . -name "callgrind.out.*" -size +0c | sort) > callgrind_report.txt
-    verify:
-      timeout: {{ test_state2_verify_timeout }}
-      trigger_mode: unordered