[incubator-openwhisk] branch master updated: Make HA tests for controller more lenient. (#3230)

[cb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cbickel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new e7d2c7c  Make HA tests for controller more lenient. (#3230)
e7d2c7c is described below

commit e7d2c7cc131ce84c90c75cbeccc2f6243676f543
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Thu Feb 1 09:33:37 2018 +0100

    Make HA tests for controller more lenient. (#3230)
    
    - Adjusts the value of allowed failures slightly.
    - Corrects no longer valid comment.
    - Uses the right value for limit calculation.
---
 tests/src/test/scala/ha/ShootComponentsTests.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/src/test/scala/ha/ShootComponentsTests.scala b/tests/src/test/scala/ha/ShootComponentsTests.scala
index c6e65dc..6c2d00c 100644
--- a/tests/src/test/scala/ha/ShootComponentsTests.scala
+++ b/tests/src/test/scala/ha/ShootComponentsTests.scala
@@ -58,7 +58,7 @@ class ShootComponentsTests
 
   // Throttle requests to the remaining controllers to avoid getting 429s. (60 req/min)
   val amountOfControllers = WhiskProperties.getProperty(WhiskConfig.controllerInstances).toInt
-  val limit = WhiskProperties.getProperty(WhiskConfig.actionInvokeConcurrentLimit).toDouble
+  val limit = WhiskProperties.getProperty(WhiskConfig.actionInvokePerMinuteLimit).toDouble
   val limitPerController = limit / amountOfControllers
   val allowedRequestsPerMinute = (amountOfControllers - 1.0) * limitPerController
   val timeBeweenRequests = 60.seconds / allowedRequestsPerMinute
@@ -187,11 +187,11 @@ class ShootComponentsTests
       val requests = requestsBeforeRestart ++ requestsAfterRestart
 
       val unsuccessfulInvokes = requests.map(_._1).count(_ != TestUtils.SUCCESS_EXIT)
-      // Allow 3 failures for the 100 seconds
-      unsuccessfulInvokes should be <= 3
+      // Allow 5 failures for the 100 seconds
+      unsuccessfulInvokes should be <= 5
 
       val unsuccessfulGets = requests.map(_._2).count(_ != TestUtils.SUCCESS_EXIT)
-      // Only allow 1 failure in GET requests, because they are idempotent and they should be passed to the next controller if one crashes
+      // Allow no failures in GET requests, because they are idempotent and they should be passed to the next controller if one crashes
       unsuccessfulGets shouldBe 0
 
       // Check that both controllers are up

-- 
To stop receiving notification emails like this one, please contact
cbickel@apache.org.