From 412e80b9b17f0f992517b5fe924b13ec4aec1217 Mon Sep 17 00:00:00 2001 From: Raghuveer Raavi Date: Wed, 9 Sep 2020 10:02:40 -0400 Subject: [PATCH 1/2] Updated error response for 'tooManyConcurrencyRequests' to be more descriptive --- .../main/scala/org/apache/openwhisk/http/ErrorResponse.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/scala/src/main/scala/org/apache/openwhisk/http/ErrorResponse.scala b/common/scala/src/main/scala/org/apache/openwhisk/http/ErrorResponse.scala index 5424dd309f7..96654466d03 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/http/ErrorResponse.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/http/ErrorResponse.scala @@ -72,7 +72,7 @@ object Messages { /** Standard message for too many concurrent activation requests within a time window. */ def tooManyConcurrentRequests(count: Int, allowed: Int) = - s"Too many concurrent requests in flight (count: $count, allowed: $allowed)." + s"Too many concurrent requests in flight (currently running: $count, allowed per controller: $allowed)." /** System overload message. */ val systemOverloaded = "System is overloaded, try again later." From 6f27606af5df377f06ba64f584cb3e0697d20642 Mon Sep 17 00:00:00 2001 From: Raghuveer Raavi Date: Thu, 10 Sep 2020 11:56:26 -0400 Subject: [PATCH 2/2] Fixed breaking test --- tests/src/test/scala/limits/ThrottleTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/test/scala/limits/ThrottleTests.scala b/tests/src/test/scala/limits/ThrottleTests.scala index 7b9e00fad60..9f76ff4f0c3 100644 --- a/tests/src/test/scala/limits/ThrottleTests.scala +++ b/tests/src/test/scala/limits/ThrottleTests.scala @@ -467,7 +467,7 @@ class NamespaceSpecificThrottleTests } wsk.action.invoke(actionName, expectedExitCode = TooManyRequests.intValue).stderr should { - include(prefix(tooManyConcurrentRequests(0, 0))) and include("allowed: 0") + include(prefix(tooManyConcurrentRequests(0, 0))) and include("allowed per controller: 0") } }