Fix timer not canceling

code-asher · code-asher · commit e158d9d95949 · 2023-04-27T17:07:29.000-08:00
It seems to operate in its own little world and I have no idea how to
make it stop when the job running it has stopped.
diff --git a/src/main/kotlin/com/coder/gateway/sdk/Retry.kt b/src/main/kotlin/com/coder/gateway/sdk/Retry.kt
@@ -4,12 +4,9 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.ssh.SshException
 import kotlinx.coroutines.delay
-import kotlinx.datetime.Clock
 import java.util.Random
 import java.util.concurrent.TimeUnit
-import kotlin.concurrent.timer
 import kotlin.coroutines.cancellation.CancellationException
-import kotlin.math.max
 import kotlin.math.min
 
 fun unwrap(ex: Exception): Throwable? {
@@ -66,19 +63,14 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
               update(attempt, unwrappedEx, null)
               return null
           }
-          val end = Clock.System.now().toEpochMilliseconds() + delayMs
-          val timer = timer(period = TimeUnit.SECONDS.toMillis(1)) {
-              val now = Clock.System.now().toEpochMilliseconds()
-              val next = max(end - now, 0)
-              if (next > 0) {
-                  update(attempt, unwrappedEx, next)
-              } else {
-                  cancel()
-              }
-          }
           logger.error("Failed to $label (attempt $attempt; will retry in $delayMs ms)", originalEx)
-          delay(delayMs)
-          timer.cancel()
+          var remainingMs = delayMs
+          while (remainingMs > 0) {
+              update(attempt, unwrappedEx, remainingMs)
+              val next = min(remainingMs, TimeUnit.SECONDS.toMillis(1))
+              remainingMs -= next
+              delay(next)
+          }
           delayMs = min(delayMs * backOffFactor, backOffLimitMs) + (random.nextGaussian() * delayMs * backOffJitter).toLong()
       }
     }
