Skip to content

Replace exception-based handling with logging for stopping already finished runs #1098

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.

Sign up for GitHub

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

Merged
jreynard-code merged 1 commit into from
Nov 27, 2025
Merged

Replace exception-based handling with logging for stopping already finished runs #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 6 additions & 13 deletions ...r/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import io.mockk.junit5.MockKExtension
import io.mockk.mockk
import io.mockk.mockkStatic
import java.io.FileInputStream
import java.lang.IllegalStateException
import java.time.Instant
import java.util.*
import kotlin.test.assertEquals
Expand Down Expand Up @@ -1516,12 +1515,9 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
val run = runnerApiService.startRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
assertEquals(expectedRunId, run.id)

val exception =
assertThrows<IllegalStateException> {
runnerApiService.stopRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
}

assertEquals("Run $expectedRunId can not be stopped as its already finished", exception.message)
assertDoesNotThrow {
runnerApiService.stopRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
}
}

@Test
Expand All @@ -1543,12 +1539,9 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
val run = runnerApiService.startRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
assertEquals(expectedRunId, run.id)

val exception =
assertThrows<IllegalStateException> {
runnerApiService.stopRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
}

assertEquals("Run $expectedRunId can not be stopped as its already finished", exception.message)
assertDoesNotThrow {
runnerApiService.stopRun(organizationSaved.id, workspaceSaved.id, runnerSaved.id)
}
}

@Test
Expand Down
8 changes: 6 additions & 2 deletions runner/src/main/kotlin/com/cosmotech/runner/service/RunnerApiServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.cosmotech.runner.domain.RunnerCreateRequest
import com.cosmotech.runner.domain.RunnerRole
import com.cosmotech.runner.domain.RunnerSecurity
import com.cosmotech.runner.domain.RunnerUpdateRequest
import org.slf4j.LoggerFactory
import org.springframework.context.event.EventListener
import org.springframework.data.domain.PageRequest
import org.springframework.stereotype.Service
Expand All @@ -34,6 +35,9 @@ internal class RunnerApiServiceImpl(
private val runnerServiceManager: RunnerServiceManager,
private val datasetApiServiceInterface: DatasetApiServiceInterface
) : RunnerApiServiceInterface {

private val logger = LoggerFactory.getLogger(RunnerApiServiceImpl::class.java)

override fun getRunnerService(): RunnerService = runnerServiceManager.getRunnerService()

override fun createRunner(
Expand Down Expand Up @@ -141,8 +145,8 @@ internal class RunnerApiServiceImpl(
runnerService.stopLastRunOf(runnerInstance)
return
}
throw IllegalStateException(
"Run ${lastRunInfo.lastRunId} can not be stopped as its already finished")

logger.debug("Run ${lastRunInfo.lastRunId} can not be stopped as its already finished")
}

override fun createRunnerAccessControl(
Expand Down
Loading