Skip to content

chore: add defensive check to skip retry when node is starting #679

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

Open
jvsena42 wants to merge 5 commits into
base: master
Choose a base branch
from
+31 −0
Open

chore: add defensive check to skip retry when node is starting #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e6d5e3
fix: add defensive check to retry flow
jvsena42 Jan 20, 2026
badbdc3
fix: check only if node is runnning
jvsena42 Jan 20, 2026
a9e76cd
test: update defensive check test for isRunning
jvsena42 Jan 20, 2026
9f1a5af
Merge branch 'master' into fix/add-retry-defensive-check
jvsena42 Jan 20, 2026
7805644
Merge branch 'master' into fix/add-retry-defensive-check
jvsena42 Jan 20, 2026
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
6 changes: 6 additions & 0 deletions app/src/main/java/to/bitkit/repositories/LightningRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,12 @@ class LightningRepo @Inject constructor(
scope.launch { registerForNotifications() }
Unit
}.onFailure { e ->
val currentLifecycleState = _lightningState.value.nodeLifecycleState
if (currentLifecycleState.isRunning()) {
Logger.warn("Start error occurred but node is $currentLifecycleState, skipping retry", e, context = TAG)
return@withContext Result.success(Unit)
}

if (shouldRetry) {
val retryDelay = 2.seconds
Logger.warn("Start error, retrying after $retryDelay...", e, context = TAG)
Expand Down
25 changes: 25 additions & 0 deletions app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.mockito.kotlin.inOrder
import org.mockito.kotlin.isNull
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.verifyBlocking
import org.mockito.kotlin.whenever
Expand Down Expand Up @@ -646,4 +647,28 @@ class LightningRepoTest : BaseUnitTest() {
assertTrue(result.isSuccess)
verify(lightningService).setup(any(), anyOrNull(), anyOrNull(), isNull(), anyOrNull())
}

@Test
fun `start should not retry when node lifecycle state is Running`() = test {
sut.setInitNodeLifecycleState()
whenever(lightningService.node).thenReturn(null)
whenever(lightningService.setup(any(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(Unit)
whenever(settingsStore.data).thenReturn(flowOf(SettingsData()))
val blocktank = mock<BlocktankService>()
whenever(coreService.blocktank).thenReturn(blocktank)
whenever(blocktank.info(any())).thenReturn(null)

// lightningService.start() succeeds (state becomes Running at line 241)
whenever(lightningService.start(anyOrNull(), any())).thenReturn(Unit)
// lightningService.nodeId throws during syncState() (called at line 244, AFTER state = Running)
whenever(lightningService.nodeId).thenThrow(RuntimeException("error during syncState"))

val result = sut.start()

// Defensive check: state is Running, so don't retry, return success
assertTrue(result.isSuccess)
assertEquals(NodeLifecycleState.Running, sut.lightningState.value.nodeLifecycleState)
// Verify start was only called once (no retry)
verify(lightningService, times(1)).start(anyOrNull(), any())
}
}
Loading