#714 Release all locks when Pramen job exits abnormally.#715
Merged
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughIntroduces a token property to the TokenLock API and adds a TokenLockRegistry singleton to track, unregister, and release active token locks. TokenLockBase and implementations now register/unregister with the registry; pipeline shutdown calls releaseAllLocks() to clean up remaining locks. Changes
Sequence DiagramsequenceDiagram
participant Job as Job / Pipeline
participant Lock as TokenLock Instance
participant Registry as TokenLockRegistry
participant State as PipelineStateImpl
Job->>Lock: tryAcquire()
activate Lock
Lock->>Lock: evaluate isAcquired
alt acquired
Lock->>Registry: registerLock(this)
activate Registry
Registry->>Registry: add lock to list
deactivate Registry
Lock->>Job: return true
else not acquired
Lock->>Job: return false
end
deactivate Lock
Job->>Lock: release()
activate Lock
Lock->>Lock: release guard & resource
Lock->>Registry: unregisterLock(this)
activate Registry
Registry->>Registry: remove lock from list
deactivate Registry
deactivate Lock
Job->>State: onAppFinish()
activate State
State->>Registry: releaseAllLocks()
activate Registry
Registry->>Registry: snapshot active locks
loop for each lock
Registry->>Lock: release()
activate Lock
Lock->>Lock: release resource
deactivate Lock
end
Registry->>Registry: clear registry
deactivate Registry
State->>State: continue shutdown steps
deactivate State
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs). Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockBase.scala (1)
100-106:⚠️ Potential issue | 🟠 MajorEnsure registry unregistration and hook removal run even when guard release fails.
If
releaseGuardLock()throws,TokenLockRegistry.unregisterLock(this)andJvmUtils.safeRemoveShutdownHook(shutdownHook)are skipped, leaving stale lifecycle state.🛠️ Proposed fix
if (wasAcquired) { watcherThreadOpt.foreach(_.interrupt()) watcherThreadOpt = None - releaseGuardLock() - JvmUtils.safeRemoveShutdownHook(shutdownHook) - TokenLockRegistry.unregisterLock(this) + try { + releaseGuardLock() + } finally { + JvmUtils.safeRemoveShutdownHook(shutdownHook) + TokenLockRegistry.unregisterLock(this) + } log.info(s"Lock released: '$escapedToken'.") }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockBase.scala` around lines 100 - 106, The existing release path may skip JvmUtils.safeRemoveShutdownHook(shutdownHook) and TokenLockRegistry.unregisterLock(this) if releaseGuardLock() throws; update the code to ensure shutdownHook removal and registry unregistration always run by wrapping releaseGuardLock() in a try/finally (or equivalent) so that after attempting releaseGuardLock() you always call JvmUtils.safeRemoveShutdownHook(shutdownHook) and TokenLockRegistry.unregisterLock(this); preserve the existing watcherThreadOpt interruption and watcherThreadOpt = None/wasAcquired handling but move the removal/unregister calls into the finally block to guarantee cleanup even on exceptions.
🧹 Nitpick comments (2)
pramen/core/src/main/scala/za/co/absa/pramen/core/state/PipelineStateImpl.scala (1)
202-214: Make lock cleanup unconditional inonAppFinish().
TokenLockRegistry.releaseAllLocks()is currently the last statement. Wrapping preceding steps intry/finallykeeps lock release guaranteed even if new failure paths are introduced later.♻️ Proposed refactor
private[state] def onAppFinish(): Unit = { if (!exitedNormally && failureException.isEmpty && signalException.isDefined) { failureException = signalException exitCode |= EXIT_CODE_SIGNAL_RECEIVED } finishedInstant = Option(Instant.now()) - sendPipelineNotifications() - runCustomShutdownHook() - removeSignalHandlers() - sendNotificationEmail() - TokenLockRegistry.releaseAllLocks() + try { + sendPipelineNotifications() + runCustomShutdownHook() + removeSignalHandlers() + sendNotificationEmail() + } finally { + TokenLockRegistry.releaseAllLocks() + } }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pramen/core/src/main/scala/za/co/absa/pramen/core/state/PipelineStateImpl.scala` around lines 202 - 214, The lock cleanup call TokenLockRegistry.releaseAllLocks() must run unconditionally from onAppFinish(); wrap the existing sequence (the conditional setting of failureException/exitCode, finishedInstant assignment, sendPipelineNotifications(), runCustomShutdownHook(), removeSignalHandlers(), sendNotificationEmail()) in a try block and move TokenLockRegistry.releaseAllLocks() into the finally block so locks are always released even if any of those methods throw; preserve existing variable updates (exitedNormally, failureException, exitCode, finishedInstant) and ensure exceptions continue to propagate after locks are released.pramen/core/src/test/scala/za/co/absa/pramen/core/tests/lock/TokenLockJdbcSuite.scala (1)
102-108: Strengthen this test to verify external lock release, not only internal state.Checking
isAcquiredconfirms local state, but re-acquiring the same token validates that the backing lock was actually released.🧪 Proposed test improvement
"lock registry releases all locks" in { val lock1 = getLock("token1") assert(lock1.tryAcquire()) TokenLockRegistry.releaseAllLocks() assert(!lock1.asInstanceOf[TokenLockBase].isAcquired) + + val lock2 = getLock("token1") + assert(lock2.tryAcquire()) + lock2.release() }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pramen/core/src/test/scala/za/co/absa/pramen/core/tests/lock/TokenLockJdbcSuite.scala` around lines 102 - 108, The test currently only checks internal state via TokenLockBase.isAcquired after calling TokenLockRegistry.releaseAllLocks(); instead, after releasing, attempt to actually re-acquire the backing lock for the same token to ensure external release: call TokenLockRegistry.releaseAllLocks(), then obtain a new lock for the same token using getLock("token1") (or reuse lock1) and assert that tryAcquire() returns true (and release it afterwards). Reference getLock, TokenLockRegistry.releaseAllLocks, TokenLockBase.isAcquired and tryAcquire to locate where to add the re-acquire assertion.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala`:
- Around line 55-60: The catch block in TokenLockRegistry where
currentListCopy.foreach calls l.release() swallows the exception; update the
NonFatal(ex) handler to include the exception when logging so failures to
release locks are visible—e.g., change the log.warn call in the catch for
NonFatal(ex) to pass the exception (or its message) along with the descriptive
text that includes l.token, ensuring the warning contains the exception/stack
trace for diagnostics.
---
Outside diff comments:
In `@pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockBase.scala`:
- Around line 100-106: The existing release path may skip
JvmUtils.safeRemoveShutdownHook(shutdownHook) and
TokenLockRegistry.unregisterLock(this) if releaseGuardLock() throws; update the
code to ensure shutdownHook removal and registry unregistration always run by
wrapping releaseGuardLock() in a try/finally (or equivalent) so that after
attempting releaseGuardLock() you always call
JvmUtils.safeRemoveShutdownHook(shutdownHook) and
TokenLockRegistry.unregisterLock(this); preserve the existing watcherThreadOpt
interruption and watcherThreadOpt = None/wasAcquired handling but move the
removal/unregister calls into the finally block to guarantee cleanup even on
exceptions.
---
Nitpick comments:
In
`@pramen/core/src/main/scala/za/co/absa/pramen/core/state/PipelineStateImpl.scala`:
- Around line 202-214: The lock cleanup call TokenLockRegistry.releaseAllLocks()
must run unconditionally from onAppFinish(); wrap the existing sequence (the
conditional setting of failureException/exitCode, finishedInstant assignment,
sendPipelineNotifications(), runCustomShutdownHook(), removeSignalHandlers(),
sendNotificationEmail()) in a try block and move
TokenLockRegistry.releaseAllLocks() into the finally block so locks are always
released even if any of those methods throw; preserve existing variable updates
(exitedNormally, failureException, exitCode, finishedInstant) and ensure
exceptions continue to propagate after locks are released.
In
`@pramen/core/src/test/scala/za/co/absa/pramen/core/tests/lock/TokenLockJdbcSuite.scala`:
- Around line 102-108: The test currently only checks internal state via
TokenLockBase.isAcquired after calling TokenLockRegistry.releaseAllLocks();
instead, after releasing, attempt to actually re-acquire the backing lock for
the same token to ensure external release: call
TokenLockRegistry.releaseAllLocks(), then obtain a new lock for the same token
using getLock("token1") (or reuse lock1) and assert that tryAcquire() returns
true (and release it afterwards). Reference getLock,
TokenLockRegistry.releaseAllLocks, TokenLockBase.isAcquired and tryAcquire to
locate where to add the re-acquire assertion.
ℹ️ Review info
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (8)
pramen/api/src/main/scala/za/co/absa/pramen/api/lock/TokenLock.scalapramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockAllow.scalapramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockBase.scalapramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockFactoryAllow.scalapramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scalapramen/core/src/main/scala/za/co/absa/pramen/core/state/PipelineStateImpl.scalapramen/core/src/test/scala/za/co/absa/pramen/core/mocks/lock/TokenLockMock.scalapramen/core/src/test/scala/za/co/absa/pramen/core/tests/lock/TokenLockJdbcSuite.scala
pramen/core/src/main/scala/za/co/absa/pramen/core/lock/TokenLockRegistry.scala
Show resolved
Hide resolved
Unit Test Coverage
Files
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #714
Summary by CodeRabbit
New Features
Refactor
Tests