diff --git a/openshift/performance/scripts/run-all-performance-tests.sh b/openshift/performance/scripts/run-all-performance-tests.sh index 232976f8eedf..36a007d82889 100755 --- a/openshift/performance/scripts/run-all-performance-tests.sh +++ b/openshift/performance/scripts/run-all-performance-tests.sh @@ -61,16 +61,16 @@ else for name in $(oc get machineset -n openshift-machine-api -o name); do oc scale "$name" -n openshift-machine-api --replicas=4; done oc wait --for=jsonpath="{.status.availableReplicas}=4" machineset --all -n openshift-machine-api --timeout=-1s - oc patch knativeserving knative-serving \ - -n "${SYSTEM_NAMESPACE}" \ - --type merge --patch-file "$(dirname "$0")/serving-simple.json" +# oc patch knativeserving knative-serving \ +# -n "${SYSTEM_NAMESPACE}" \ +# --type merge --patch-file "$(dirname "$0")/serving-simple.json" # remove pods and start fresh - oc delete po --all -n knative-serving --force --grace-period=0 - oc delete po --all -n knative-serving-ingress --force --grace-period=0 +# oc delete po --all -n knative-serving --force --grace-period=0 +# oc delete po --all -n knative-serving-ingress --force --grace-period=0 # make sure we are in good shape after patching - oc wait --for=condition=Ready knativeserving.operator.knative.dev knative-serving -n "${SYSTEM_NAMESPACE}" --timeout=900s +# oc wait --for=condition=Ready knativeserving.operator.knative.dev knative-serving -n "${SYSTEM_NAMESPACE}" --timeout=900s oc get nodes | wc -l fi diff --git a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct-lin.yaml b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct-lin.yaml index 566b34319eac..6c14c9edf1b5 100644 --- a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct-lin.yaml +++ b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct-lin.yaml @@ -21,10 +21,11 @@ spec: template: metadata: annotations: - autoscaling.knative.dev/minScale: "100" - autoscaling.knative.dev/maxScale: "150" + autoscaling.knative.dev/minScale: "50" + autoscaling.knative.dev/maxScale: "100" # Always hook the activator in. autoscaling.knative.dev/targetBurstCapacity: "-1" + serving.knative.dev/rollout-duration: "240s" spec: containers: - image: ko://knative.dev/serving/test/test_images/autoscale @@ -33,7 +34,7 @@ spec: cpu: 20m memory: 20Mi limits: - cpu: 500m - memory: 500Mi - containerConcurrency: 10 + cpu: 300m + memory: 300Mi + containerConcurrency: 30 --- diff --git a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct.yaml b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct.yaml index af3a3d44cdb7..c16214a55760 100644 --- a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct.yaml +++ b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct.yaml @@ -21,11 +21,12 @@ spec: template: metadata: annotations: - autoscaling.knative.dev/minScale: "100" - autoscaling.knative.dev/maxScale: "150" + autoscaling.knative.dev/minScale: "50" + autoscaling.knative.dev/maxScale: "100" # Always hook the activator in. autoscaling.knative.dev/targetBurstCapacity: "-1" autoscaling.knative.dev/metricAggregationAlgorithm: "weightedExponential" + serving.knative.dev/rollout-duration: "240s" spec: containers: - image: ko://knative.dev/serving/test/test_images/autoscale @@ -34,7 +35,7 @@ spec: cpu: 20m memory: 20Mi limits: - cpu: 500m - memory: 500Mi - containerConcurrency: 10 + cpu: 300m + memory: 300Mi + containerConcurrency: 30 --- diff --git a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-queue-proxy-direct.yaml b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-queue-proxy-direct.yaml index 503de19535a4..21b033413e4d 100644 --- a/test/performance/benchmarks/rollout-probe/rollout-probe-setup-queue-proxy-direct.yaml +++ b/test/performance/benchmarks/rollout-probe/rollout-probe-setup-queue-proxy-direct.yaml @@ -33,7 +33,7 @@ spec: cpu: 20m memory: 20Mi limits: - cpu: 500m - memory: 500Mi + cpu: 250m + memory: 250Mi containerConcurrency: 10 --- diff --git a/test/performance/benchmarks/scale-from-zero/main.go b/test/performance/benchmarks/scale-from-zero/main.go index e6ff603cfbc2..bb3bb1b37713 100644 --- a/test/performance/benchmarks/scale-from-zero/main.go +++ b/test/performance/benchmarks/scale-from-zero/main.go @@ -74,8 +74,8 @@ var ( }{ 1: { p95min: 0, - p95max: 40 * time.Millisecond, - latencyMax: 40 * time.Millisecond, + p95max: 50 * time.Millisecond, + latencyMax: 50 * time.Millisecond, }, 5: { p95min: 0, diff --git a/test/performance/performance-tests.sh b/test/performance/performance-tests.sh index de733ff52747..8c0b315bfc81 100755 --- a/test/performance/performance-tests.sh +++ b/test/performance/performance-tests.sh @@ -204,6 +204,8 @@ kubectl wait --for=delete ksvc/load-test-200 --timeout=60s -n "$ns" ############################################################################################### header "Rollout probe: activator direct" +toggle_feature scale-to-zero-grace-period 10s config-autoscaler + ko apply --sbom=none -Bf "${REPO_ROOT_DIR}/test/performance/benchmarks/rollout-probe/rollout-probe-setup-activator-direct.yaml" kubectl wait --timeout=800s --for=condition=ready ksvc -n "$ns" --all