Try to set longer timeouts for Register() in connect #7736
Merged
Conversation
This file contains 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
gravityrail
force-pushed
the
fix/timeouts-for-register
branch
from
e51d603 to
2c56fe0
Compare
jeherve
added
General
[Status] Needs Review
ebinnion
reviewed
Sep 20, 2017
class.jetpack.php
Outdated
| /** | ||
| * Sets a minimum request timeout, and returns the current timeout | ||
| * | ||
| * @since 5.3 |
There was a problem hiding this comment.
We'll need to update this to 5.4.
ebinnion
previously requested changes
Sep 20, 2017
class.jetpack.php
Outdated
| @@ -4776,11 +4776,25 @@ public static function delete_secrets( $action, $user_id ) { | |||
| * @since 2.6 | |||
| * @return int | |||
| **/ | |||
| public function get_remote_query_timeout_limit() { | |||
There was a problem hiding this comment.
Since we're effectively deleting and creating a new method here, we should probably update the @since.
class.jetpack.php
Outdated
| @@ -4776,11 +4776,25 @@ public static function delete_secrets( $action, $user_id ) { | |||
| * @since 2.6 | |||
| * @return int | |||
| **/ | |||
| public function get_remote_query_timeout_limit() { | |||
There was a problem hiding this comment.
Should we find a way to deprecate get_remote_query_timeout_limit() to minimize errors if other plugins are using this?
class.jetpack.php
Outdated
| $timeout = (int) ini_get( 'max_execution_time' ); | ||
| if ( ! $timeout ) // Ensure exec time set in php.ini | ||
| $timeout = 30; | ||
| return intval( $timeout / 2 ); | ||
| $timeout = 30; |
There was a problem hiding this comment.
Since we're touching this code, can we add the { and } around the if conditional?
class.jetpack.php
Outdated
| $timeout = (int) ini_get( 'max_execution_time' ); | ||
| if ( ! $timeout ) // Ensure exec time set in php.ini | ||
| $timeout = 30; | ||
| return intval( $timeout / 2 ); | ||
| $timeout = 30; |
There was a problem hiding this comment.
Also, there are leading spaces before all lines except one in this method. That's a minor nitpick, but should be an easy fix if you go back in.
zinigor
added
[Status] Ready to Merge
dereksmart
dismissed
ebinnion’s stale review
seems as though all of the feedback was addressed
dereksmart
removed
the
[Status] Ready to Merge
dereksmart
added a commit
that referenced
this pull request
Sep 26, 2017
* initial commit for running changelog * Update stable tag in readme * Changelog: move old releases to changelog.txt. Also add release post URL for 5.4 * Changelog: add #7729 * Changelog: add #7736 * Changelog: add #7737 * Changelog: add #7740 * Changelog: add #7742 * Changelog: add #7366 * Changelog: add #7664 * Changelog: add #7751 * Changelog: add #7764 * Changelog: add #7768 * Changelog: add #7796 * Changelog: add #7798 * Changelog: add #7822 * Changelog: add #7824 * Changelog: add #7825 * Changelog: add #7826 * Changelog: add #7829 * Changelog: add #7831 * Changelog: add #7837 * Changelog: add #7850 * Changelog: add #7852 * Changelog: add #6538 * Changelog: add #7767 * Changelog: add #7782 * Changelog: add #7797 * Changelog: add #7819 * update to-test to add misc stuff * add comment edit fix to changelog
dereksmart
added a commit
that referenced
this pull request
Sep 26, 2017
* initial commit for running changelog * Update stable tag in readme * Changelog: move old releases to changelog.txt. Also add release post URL for 5.4 * Changelog: add #7729 * Changelog: add #7736 * Changelog: add #7737 * Changelog: add #7740 * Changelog: add #7742 * Changelog: add #7366 * Changelog: add #7664 * Changelog: add #7751 * Changelog: add #7764 * Changelog: add #7768 * Changelog: add #7796 * Changelog: add #7798 * Changelog: add #7822 * Changelog: add #7824 * Changelog: add #7825 * Changelog: add #7826 * Changelog: add #7829 * Changelog: add #7831 * Changelog: add #7837 * Changelog: add #7850 * Changelog: add #7852 * Changelog: add #6538 * Changelog: add #7767 * Changelog: add #7782 * Changelog: add #7797 * Changelog: add #7819 * update to-test to add misc stuff * add comment edit fix to changelog
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.
When users connect Jetpack, the very first step is registration.
A couple of hundred sites a day fail registration because of timeouts, and of these the vast majority are sending us a timeout of 15 seconds or less (the timeout sent by Jetpack is 50% of the
max_execution_time, to allow for multiple connection attempts).This is because in order to register the site, WPCOM must make a couple of requests, and some Jetpack sites are pretty slow.
Some sites appear to have execution timeouts as short as 10 seconds, which is not anywhere near enough to register a lot of the time.
This change tells PHP to increase the local
max_execution_timefor the duration of the register() step so that WPCOM has more time to register the site. If the request timeout is already longer than 60 seconds, it leaves it unaltered.To test: