-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Make run-tests.php check for tcp fwrite edge cases #8023
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1729,11 +1729,46 @@ function run_all_tests_parallel(array $test_files, array $env, $redir_tested): v | |
} | ||
} | ||
|
||
/** | ||
* Calls fwrite and retries when network writes fail with errors such as "Resource temporarily unavailable" | ||
* | ||
* @param resource $stream the stream to fwrite to | ||
* @param string $data | ||
* @return int|false | ||
*/ | ||
function safe_fwrite($stream, string $data) | ||
{ | ||
// safe_fwrite was tested by adding $message['unused'] = str_repeat('a', 20_000_000); in send_message() | ||
// fwrites on tcp sockets can return false or less than strlen if the recipient is busy. | ||
// (e.g. fwrite(): Send of 577 bytes failed with errno=35 Resource temporarily unavailable) | ||
$bytesWritten = 0; | ||
$retryAttempts = 0; | ||
while ($bytesWritten < strlen($data)) { | ||
$n = @fwrite($stream, substr($data, $bytesWritten)); | ||
if ($n === false) { | ||
if ($retryAttempts >= 10) { | ||
echo "ERROR: send_message() Failed to write chunk after 10 retries: " . error_get_last()['message'] . "\n"; | ||
return false; | ||
} | ||
$writeSockets = [$stream]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
$readSockets = []; | ||
$exceptSockets = []; | ||
/* Wait for a second and retry up to 10 times. Use a finite timeout and retry count in case stream_select returns inaccurate values or returns immediately. */ | ||
stream_select($readSockets, $writeSockets, $exceptSockets, 1); | ||
$retryAttempts++; | ||
continue; | ||
} | ||
$bytesWritten += $n; | ||
$retryAttempts = 0; | ||
} | ||
return $bytesWritten; | ||
} | ||
|
||
function send_message($stream, array $message): void | ||
{ | ||
$blocking = stream_get_meta_data($stream)["blocked"]; | ||
stream_set_blocking($stream, true); | ||
fwrite($stream, base64_encode(serialize($message)) . "\n"); | ||
safe_fwrite($stream, base64_encode(serialize($message)) . "\n"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unused return value, should something happen if a write fails? |
||
stream_set_blocking($stream, $blocking); | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The rest of this file uses
snake_case