From: Terry Burton <tez@terryburton.co.uk>
Date: Fri, 3 Dec 2021 13:37:47 +0000 (+0000)
Subject: Fuzzer corpus pushback: Spread calls to the file_update API to avoid clashes (#4324)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e59a3d8fd69e6eb371b5b695fb26f15b289bad;p=thirdparty%2Ffreeradius-server.git

Fuzzer corpus pushback: Spread calls to the file_update API to avoid clashes (#4324)
---

diff --git a/.github/workflows/ci-scheduled-fuzzing.yml b/.github/workflows/ci-scheduled-fuzzing.yml
index a4d52185215..d2e75dad91e 100644
--- a/.github/workflows/ci-scheduled-fuzzing.yml
+++ b/.github/workflows/ci-scheduled-fuzzing.yml
@@ -47,8 +47,8 @@ jobs:
   #
   #    matrix:
   #      env:
-  #        - { "PROTOCOL": "radius", "TOTAL_RUNTIME": "20000" }
-  #        - { "PROTOCOL": "dhcpv4", "TOTAL_RUNTIME": "20000" }
+  #        - { "PROTOCOL": "radius", "TOTAL_RUNTIME": "20000", "UPLOAD_SLOT": "0", "NUM_SLOTS": "15" }
+  #        - { "PROTOCOL": "dhcpv4", "TOTAL_RUNTIME": "20000", "UPLOAD_SLOT": "3", "NUM_SLOTS": "15" }
   #        - ...
   #
   set-matrix:
@@ -80,18 +80,19 @@ jobs:
         #  GitHub Action run limit)
         #
         TOTAL_RUNTIME=20000
-        PROTOS=`sed -ne 's/^FUZZER_PROTOCOLS\s\+=\s\+\(.*\)/\1/p' src/bin/all.mk`
+        SLOT_SPREAD=3  # secs
+        read -r -a PROTOS <<< $(sed -ne 's/^FUZZER_PROTOCOLS\s\+=\s\+\(.*\)/\1/p' src/bin/all.mk)
         #
         if [[ "$GITHUB_REF" = refs/heads/run-fuzzer-*-* ]]; then
           PROTOS=${GITHUB_REF#refs/heads/run-fuzzer-}
           TOTAL_RUNTIME=${PROTOS##*-}
-          PROTOS=${PROTOS%-*}
+          PROTOS=( "${PROTOS%-*}" )
         elif [[ "$GITHUB_REF" = refs/heads/run-fuzzer-* ]]; then
           TOTAL_RUNTIME=${GITHUB_REF#refs/heads/run-fuzzer-}
         fi
         P=$(
-            for PROTO in $PROTOS; do
-              echo "{ \"PROTOCOL\": \"$PROTO\", \"TOTAL_RUNTIME\": \"$TOTAL_RUNTIME\" },"
+            for i in ${!PROTOS[@]}; do
+              echo "{ \"PROTOCOL\": \"${PROTOS[$i]}\", \"TOTAL_RUNTIME\": \"$TOTAL_RUNTIME\", \"UPLOAD_SLOT\": \"$((i * $SLOT_SPREAD))\", \"NUM_SLOTS\": \"$((${#PROTOS[@]} * $SLOT_SPREAD))\" },"
             done
           )
         M=$(cat <<EOF
@@ -252,6 +253,9 @@ jobs:
           OID="$(git lfs ls-files -l -I "$FILE" | cut -f1 -d ' ')"
           git lfs push --object-id origin "$OID"
           export CONTENTS="$(git show ":$FILE" | base64)"
+          SLEEP_FOR=$(( ( $UPLOAD_SLOT - `date +%s` % $NUM_SLOTS + $NUM_SLOTS ) % $NUM_SLOTS ))
+          echo Waiting $SLEEP_FOR secs for our upload slot...
+          sleep $SLEEP_FOR
           python3 scripts/ci/commit_lfs_file_update.py
         fi
       env: