From 6b46daa68d7f22349813b7fa4165ca9e4dafefb3 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:03:21 -0500 Subject: [PATCH 1/8] further fine tuning Signed-off-by: Cassandra Coyle --- tests/perf/actor_reminder/actor_reminder_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/perf/actor_reminder/actor_reminder_test.go b/tests/perf/actor_reminder/actor_reminder_test.go index a2f82f58fff..880b9ebef92 100644 --- a/tests/perf/actor_reminder/actor_reminder_test.go +++ b/tests/perf/actor_reminder/actor_reminder_test.go @@ -50,7 +50,7 @@ const ( // Target for the QPS - Temporary targetQPS float64 = 33 - targetSchedulerQPS float64 = 2900 + targetSchedulerQPS float64 = 2850 // Target for the QPS to trigger reminders. targetTriggerQPS float64 = 1000 @@ -296,7 +296,7 @@ func TestActorReminderSchedulerRegistrationPerformance(t *testing.T) { assert.Equal(t, 0, daprResult.RetCodes.Num400) assert.Equal(t, 0, daprResult.RetCodes.Num500) assert.Equal(t, 0, restarts) - assert.InDelta(t, targetSchedulerQPS, daprResult.ActualQPS, 10) + assert.InDelta(t, targetSchedulerQPS, daprResult.ActualQPS, 100) } type actorReminderRequest struct { From 54d5e05082d8b97a1ee97c2343cb63d4244d47c3 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:32:35 -0500 Subject: [PATCH 2/8] try fixing borked e2e Signed-off-by: Cassandra Coyle --- .github/workflows/kind-e2e.yaml | 48 +++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 3b15ad893b2..10568eb478c 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -220,14 +220,52 @@ jobs: df -h echo "Removing large packages" sudo apt-get update - sudo apt-get remove -y '^dotnet-.*' - sudo apt-get remove -y '^llvm-.*' - sudo apt-get remove -y 'php.*' - sudo apt-get remove -y 'temurin-*' - sudo apt-get remove -y microsoft-edge-stable azure-cli google-chrome-stable firefox powershell mono-devel + + // check if pkgs exist before removing them + if dpkg -l | grep -q '^dotnet-.*'; then + sudo apt-get remove -y '^dotnet-.*' + fi + + if dpkg -l | grep -q '^llvm-.*'; then + sudo apt-get remove -y '^llvm-.*' + fi + + if dpkg -l | grep -q 'php.*'; then + sudo apt-get remove -y 'php.*' + fi + + if dpkg -l | grep -q 'temurin-*'; then + sudo apt-get remove -y 'temurin-*' + fi + + if dpkg -l | grep -q 'microsoft-edge-stable'; then + sudo apt-get remove -y microsoft-edge-stable + fi + + if dpkg -l | grep -q 'azure-cli'; then + sudo apt-get remove -y azure-cli + fi + + if dpkg -l | grep -q 'google-chrome-stable'; then + sudo apt-get remove -y google-chrome-stable + fi + + if dpkg -l | grep -q 'firefox'; then + sudo apt-get remove -y firefox + fi + + if dpkg -l | grep -q 'powershell'; then + sudo apt-get remove -y powershell + fi + + if dpkg -l | grep -q 'mono-devel'; then + sudo apt-get remove -y mono-devel + fi + sudo apt-get autoremove -y sudo apt-get clean df -h + echo "Removing large directories" # deleting 15GB rm -rf /usr/share/dotnet/ From 9afe64cdc5fcb07e3400f9237bf7a5e3ca34d4eb Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:36:57 -0500 Subject: [PATCH 3/8] try fixing standalone validation Signed-off-by: Cassandra Coyle --- .github/workflows/dapr-standalone-validation.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dapr-standalone-validation.yml b/.github/workflows/dapr-standalone-validation.yml index bc7ec04c6f1..7268ea3f446 100644 --- a/.github/workflows/dapr-standalone-validation.yml +++ b/.github/workflows/dapr-standalone-validation.yml @@ -42,8 +42,16 @@ jobs: GOARCH: amd64 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh steps: - - name: Install required packages - run: pip3 install scipy psutil + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Create virtual environment + run: python3 -m venv venv + - name: Activate virtual environment and install required packages + run: | + source venv/bin/activate + pip install scipy psutil # This is a good example where we want to always compare against the latest stable release. # Pinning to a given Dapr version does not add any value in this workflow. - name: Install latest Dapr CLI From 63f23f944482f2947447544ad0881adabb8b31f2 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:40:21 -0500 Subject: [PATCH 4/8] install numpy too Signed-off-by: Cassandra Coyle --- .github/workflows/dapr-standalone-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dapr-standalone-validation.yml b/.github/workflows/dapr-standalone-validation.yml index 7268ea3f446..ecb70c19f46 100644 --- a/.github/workflows/dapr-standalone-validation.yml +++ b/.github/workflows/dapr-standalone-validation.yml @@ -51,7 +51,7 @@ jobs: - name: Activate virtual environment and install required packages run: | source venv/bin/activate - pip install scipy psutil + pip install numpy scipy psutil # This is a good example where we want to always compare against the latest stable release. # Pinning to a given Dapr version does not add any value in this workflow. - name: Install latest Dapr CLI From 04e22a3c9e09a227b0e667420014d90d6b53cce1 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:44:29 -0500 Subject: [PATCH 5/8] update pip & install pkgs globally instead of venv Signed-off-by: Cassandra Coyle --- .github/workflows/dapr-standalone-validation.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dapr-standalone-validation.yml b/.github/workflows/dapr-standalone-validation.yml index ecb70c19f46..df1e5d4d600 100644 --- a/.github/workflows/dapr-standalone-validation.yml +++ b/.github/workflows/dapr-standalone-validation.yml @@ -46,12 +46,13 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.x' - - name: Create virtual environment - run: python3 -m venv venv - - name: Activate virtual environment and install required packages + - name: Upgrade pip run: | - source venv/bin/activate - pip install numpy scipy psutil + python3 -m ensurepip --upgrade + python3 -m pip install --upgrade pip + - name: Install required Python packages + run: | + python3 -m pip install numpy scipy psutil # This is a good example where we want to always compare against the latest stable release. # Pinning to a given Dapr version does not add any value in this workflow. - name: Install latest Dapr CLI From d6380bb329dd1770d8a99e708fa45aa44ec075e6 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:47:06 -0500 Subject: [PATCH 6/8] install requests Signed-off-by: Cassandra Coyle --- .github/workflows/dapr-standalone-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dapr-standalone-validation.yml b/.github/workflows/dapr-standalone-validation.yml index df1e5d4d600..3ed79096bbd 100644 --- a/.github/workflows/dapr-standalone-validation.yml +++ b/.github/workflows/dapr-standalone-validation.yml @@ -52,7 +52,7 @@ jobs: python3 -m pip install --upgrade pip - name: Install required Python packages run: | - python3 -m pip install numpy scipy psutil + python3 -m pip install numpy scipy psutil requests # This is a good example where we want to always compare against the latest stable release. # Pinning to a given Dapr version does not add any value in this workflow. - name: Install latest Dapr CLI From 28555e03999b10878d4ea3a3542d54863a229ee3 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 10:55:21 -0500 Subject: [PATCH 7/8] // -> # for commented line Signed-off-by: Cassandra Coyle --- .github/workflows/kind-e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 10568eb478c..785e7f0e554 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -221,7 +221,7 @@ jobs: echo "Removing large packages" sudo apt-get update - // check if pkgs exist before removing them + # check if pkgs exist before removing them if dpkg -l | grep -q '^dotnet-.*'; then sudo apt-get remove -y '^dotnet-.*' fi From 435dda163e33f458a29484b6f52ad73c5923cd6a Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 15 Oct 2024 11:10:29 -0500 Subject: [PATCH 8/8] match only installed version of powershell Signed-off-by: Cassandra Coyle --- .github/workflows/kind-e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 785e7f0e554..8004afc5a53 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -254,7 +254,7 @@ jobs: sudo apt-get remove -y firefox fi - if dpkg -l | grep -q 'powershell'; then + if dpkg -l | grep -q '^powershell'; then sudo apt-get remove -y powershell fi