Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AN-333] Prevent infinite DRS download retries #7679

Merged
merged 7 commits into from
Jan 23, 2025
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,25 @@
downloadAttempt: Int = 0
): IO[DownloadResult] = {

def maybeRetryForDownloadFailure(t: Throwable): IO[DownloadResult] =
if (downloadAttempt < downloadRetries) {
backoff foreach { b => Thread.sleep(b.backoffMillis) }
logger.warn(s"Attempting download retry $downloadAttempt of $downloadRetries for a GCS url", t)
downloadWithRetries(downloadRetries,
backoff map {
_.next
},
downloadAttempt + 1
)
} else {
IO.raiseError(new RuntimeException(s"Exhausted $downloadRetries resolution retries to download GCS file", t))
}
if (downloadAttempt < downloadRetries) {
backoff foreach { b => Thread.sleep(b.backoffMillis) }

Check warning on line 61 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L60-L61

Added lines #L60 - L61 were not covered by tests
logger.warn(s"Attempting download retry $downloadAttempt of $downloadRetries for a GCS url")
downloadWithRetries(downloadRetries,
backoff map {
_.next

Check warning on line 65 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L63-L65

Added lines #L63 - L65 were not covered by tests
},
downloadAttempt + 1

Check warning on line 67 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L67

Added line #L67 was not covered by tests
)
} else {
IO.raiseError(new RuntimeException(s"Exhausted $downloadRetries resolution retries to download GCS file"))

Check warning on line 70 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L70

Added line #L70 was not covered by tests
}

// Necessary function to handle the throwable when trying to recover a failed download
def handleDownloadFailure(t: Throwable): IO[DownloadResult] =
downloadWithRetries(downloadRetries, backoff, downloadAttempt + 1)

Check warning on line 75 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L75

Added line #L75 was not covered by tests

runDownloadCommand.redeemWith(
recover = maybeRetryForDownloadFailure,
recover = handleDownloadFailure,

Check warning on line 78 in cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala

View check run for this annotation

Codecov / codecov/patch

cromwell-drs-localizer/src/main/scala/drs/localizer/downloaders/GcsUriDownloader.scala#L78

Added line #L78 was not covered by tests
bind = {
case s: DownloadSuccess.type =>
IO.pure(s)
Expand Down
Loading