fix: escalate peer read timeouts after max retries — GH#4777 - #4780
Open
balhar-jakub wants to merge 6 commits into
Open
fix: escalate peer read timeouts after max retries — GH#4777#4780balhar-jakub wants to merge 6 commits into
balhar-jakub wants to merge 6 commits into
Conversation
Member
Author
QA + Security Review (Pavel's Lens) — APPROVED ✓Pavel's Lens Results
Acceptance Criteria Verification
Security Review
Verdict: APPROVED — Ready for merge. All acceptance criteria met, all 8 Pavel rules passed, no security concerns. |
Signed-off-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Jakub Balhar <jakub.balhar@broadcom.com>
balhar-jakub
force-pushed
the
hermes/gh4777
branch
from
July 7, 2026 11:53
8078a2e to
6021e16
Compare
balhar-jakub
marked this pull request as draft
July 7, 2026 12:47
balhar-jakub
marked this pull request as ready for review
July 10, 2026 06:19
|
achmelo
reviewed
Jul 10, 2026
balhar-jakub
marked this pull request as draft
July 16, 2026 05:59
balhar-jakub
marked this pull request as ready for review
August 20, 2026 08:19
balhar-jakub
commented
Aug 20, 2026
balhar-jakub
left a comment
Member
Author
There was a problem hiding this comment.
Multi-Reviewer Review
Verdict: Approve with minor NITs.
Findings:
- ℹ️ NIT — Duplicate
hasReachedMax()checks inprocess(ReplicationTask)andprocess(List<ReplicationTask>)(lines 421 and 462). Extract a helper. - ℹ️ NIT — Log messages don't use the project's
ApimlLogger+ message ID pattern. Consider adding a new ID incommon-log-messages.yml(e.g.org.zowe.apiml.common.peerReplicationPermanentError). - ℹ️ NIT —
peer-node-read-timeout-msdoubled (15000 → 30000) — sensible, but add a comment explaining the link to GH#4777. - ✅ Test coverage is solid (boundary case at
DEFAULT_MAX_RETRIES, counter reset on success).
Good:
- Addresses achmelo's prior comment about the two log messages being too similar (the new text is now distinct).
- Behavioral change is well-reasoned: socket read timeouts escalate to
PermanentErroraftermaxPeerRetriesinstead of looping forever asCongestion. Catches the case where a peer is permanently broken. application.ymlchange is documented via the commit message (GH#4777).- New imports (
SocketTimeoutException) are minimal and scoped.
Required before merge: none. All findings are NIT-level.
Signed-off-by: Jakub Balhar <jakub.balhar@broadcom.com>
richard-salac
approved these changes
Aug 27, 2026
|
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
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 #4777
Problem
The
peer-node-read-timeout-mswas too short (15s), causing infinite retry loops under load on z/OS. Read timeouts were never escalated to permanent errors.Fix
networkIssueCounter.hasReachedMax()gate to read timeout handling inApimlPeerEurekaNodemaxPeerRetriesconsecutive read timeout failures →PermanentError(matching connection-failure behavior)peer-node-read-timeout-msfrom 15000 → 30000msFiles changed
apiml-common/.../ApimlPeerEurekaNode.java: hasReachedMax() gate in both process(task) and process(tasks)discovery-service/.../application.yml: timeout 15000 → 30000apiml/.../application.yml: timeout 15000 → 30000apiml-common/.../ReplicationTaskProcessorTest.java: 4 new tests (19 total)Build: PASS (19/19 tests)