fixed still missed out hard-coded "local ask timeouts" of 5 seconds to be dependent on recovery #2297
Conversation
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
Member
thjaeckle
commented
Dec 18, 2025
thjaeckle
commented
- during recovery, use much higher ask timeouts
- after recovery, fall back to lower one
- use configured values instead of hardcoded ones
…o be dependent on recovery * during recovery, use much higher ask timeouts * after recovery, fall back to lower one * use configured values instead of hardcoded ones
There was a problem hiding this comment.
Pull request overview
This PR addresses the issue of hard-coded local ask timeouts by making them configurable and recovery-aware. The changes enable the system to use longer timeouts during recovery and shorter ones during normal operation, improving reliability during system startup and recovery scenarios.
Key changes:
- Introduced
LocalAskTimeoutConfigto replace hard-coded 5-second timeouts - Added recovery-aware timeout logic that uses different timeouts before and after persistence actor recovery
- Updated enforcer actors to receive and handle
PA_RECOVEREDsignals
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| ThingSupervisorActor.java | Passes localAskTimeoutConfig to ThingEnforcerActor and propagates timeout to smart channel dispatching and policy enrichment |
| SupervisorSmartChannelDispatching.java | Removes hard-coded timeout constant and accepts timeout as parameter for twin queries |
| SupervisorInlinePolicyEnrichment.java | Removes hard-coded timeout constant and accepts timeout as parameter for policy retrieval |
| ThingEnforcerActor.java | Adds localAskTimeoutConfig parameter and uses dynamic timeout for local actor invocations |
| PolicyCommandEnforcementTest.java | Updates test to provide required LocalAskTimeoutConfig parameter |
| PolicySupervisorActor.java | Passes localAskTimeoutConfig to PolicyEnforcerActor |
| PolicyEnforcerActor.java | Adds localAskTimeoutConfig parameter to constructor and factory method |
| AbstractPolicyLoadingEnforcerActor.java | Forwards localAskTimeoutConfig to parent class |
| AbstractEnforcerActor.java | Implements recovery-aware timeout logic with PA_RECOVERED signal handling |
| AbstractPersistenceSupervisor.java | Makes timeout determination method protected and propagates PA_RECOVERED signal to enforcer child |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
.../src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
Show resolved
Hide resolved
.../enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcerActor.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.