Handle unchecked I/O failures in connectivity validation - #935
Open
kasnder wants to merge 1 commit into
Open
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
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.
The connectivity probe catches
IOException, but Android's socket factory can throwUncheckedIOExceptionwhen duplicating a descriptor fails withEMFILE. That bypasses the normal failure backoff even though the current executor captures the exception.Extract the socket operation into a small helper that converts unchecked I/O failures to
IOException, preserving the complete exception chain. The existing probe failure handler then applies its normal backoff. Keep the network-bound socket factory, port 443 and 10-second connect timeout; use try-with-resources for returned sockets. Unrelated runtime exceptions still propagate.Validation: 11 focused tests passed (
NetworkValidationProbeTestandServiceSinkholeValidationBackoffTest), covering checked and unchecked allocation/connect failures, socket cleanup, endpoint/timeout and existing backoff. Tests use a numeric address and fake sockets without network access.:app:lintGithubDebugpassed with no errors;git diff --checkpassed.Related to #932. This fixes probe failure handling, not the unidentified cause of long-uptime descriptor exhaustion. Current Android 16 source already closes a factory socket if binding fails, so this PR makes no factory-leak claim. No device exhaustion reproduction; keep the issue open for that investigation.