Remove keep alive validation when current KA failure limit is exceeded (

#40) * Remove keepalive validation when current KA failure limit is exceeded * Fix unit tests
gojek · Sep 1, 2022 · cec6975 · cec6975
1 parent 850a207
commit cec6975
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/adaptive-keep-alive/src/main/java/com/gojek/keepalive/OptimalKeepAliveCalculator.kt b/adaptive-keep-alive/src/main/java/com/gojek/keepalive/OptimalKeepAliveCalculator.kt
@@ -50,7 +50,7 @@ internal class OptimalKeepAliveCalculator(
     private fun calculateKeepAlive(): KeepAlive {
         stateHandler.calculateNextKeepAlive()
         return if (stateHandler.isCurrentKeepAliveFailureLimitExceeded()) {
-            onKeepAliveFailure(stateHandler.getCurrentKeepAlive())
+            handleKeepAliveFailure(stateHandler.getCurrentKeepAlive())
             getUnderTrialKeepAlive()
         } else {
             stateHandler.updateProbeCountAndConvergenceTime()
@@ -77,16 +77,21 @@ internal class OptimalKeepAliveCalculator(
     @Synchronized
     override fun onKeepAliveFailure(keepAlive: KeepAlive) {
         if (stateHandler.isValidKeepAlive(keepAlive)) {
-            stateHandler.updateKeepAliveFailureState(keepAlive)
-            if (stateHandler.isOptimalKeepAliveFound()) {
-                optimalKeepAliveObserver.onOptimalKeepAliveFound(
-                    timeMinutes = stateHandler.getOptimalKeepAlive().keepAliveMinutes,
-                    probeCount = stateHandler.getProbeCount(),
-                    convergenceTime = stateHandler.getConvergenceTime()
-                )
-            }
-            stateHandler.updatePersistenceWithLatestState()
+            handleKeepAliveFailure(keepAlive)
+        }
+    }
+
+    @VisibleForTesting
+    internal fun handleKeepAliveFailure(keepAlive: KeepAlive) {
+        stateHandler.updateKeepAliveFailureState(keepAlive)
+        if (stateHandler.isOptimalKeepAliveFound()) {
+            optimalKeepAliveObserver.onOptimalKeepAliveFound(
+                timeMinutes = stateHandler.getOptimalKeepAlive().keepAliveMinutes,
+                probeCount = stateHandler.getProbeCount(),
+                convergenceTime = stateHandler.getConvergenceTime()
+            )
         }
+        stateHandler.updatePersistenceWithLatestState()
     }
 
     @Synchronized

diff --git a/adaptive-keep-alive/src/test/java/com/gojek/keepalive/OptimalKeepAliveCalculatorTest.kt b/adaptive-keep-alive/src/test/java/com/gojek/keepalive/OptimalKeepAliveCalculatorTest.kt
@@ -110,7 +110,7 @@ class OptimalKeepAliveCalculatorTest {
         whenever(stateHandler.getCurrentKeepAlive()).thenReturn(keepAlive)
 
         val optimalKeepAliveCalculatorSpy = spy(optimalKeepAliveCalculator)
-        doNothing().whenever(optimalKeepAliveCalculatorSpy).onKeepAliveFailure(keepAlive)
+        doNothing().whenever(optimalKeepAliveCalculatorSpy).handleKeepAliveFailure(keepAlive)
 
         val underTrialKeepAlive = optimalKeepAliveCalculatorSpy.getUnderTrialKeepAlive()
 
@@ -120,7 +120,7 @@ class OptimalKeepAliveCalculatorTest {
         verify(stateHandler).isCurrentKeepAliveFailureLimitExceeded()
         verify(stateHandler).getCurrentKeepAlive()
         verify(stateHandler).getOptimalKeepAlive()
-        verify(optimalKeepAliveCalculatorSpy).onKeepAliveFailure(keepAlive)
+        verify(optimalKeepAliveCalculatorSpy).handleKeepAliveFailure(keepAlive)
     }
 
     @Test