jenkins-bot has submitted this change and it was merged. Change subject: Increase $wgCopyUploadTimeout to 90 seconds (from default 25) ......................................................................
Increase $wgCopyUploadTimeout to 90 seconds (from default 25) 25 seconds may be a sane default for most http requests, but the copy upload feature is used for uploading big files, and often sees timeouts. Obviously, commons will probably try to use this feature to upload gb big files, and that's still going to timeout, but 90 seconds is a much more reasonable timeout for normal sized files. I imagine we wouldn't want to increase it too much beyond that (although we could go a bit), as we want to cut the http request with enough time left over to actually upload the file. The php execution limit should be 120 seconds for the types of requests in question ($wgTransactionalTimeLimit), so we should definitely hit the copy upload timeout before hitting that timeout. I believe the timeout on the varnish side is 180 seconds, and I believe the timeout for the url-downloader.wikimedia.org proxy is 5 minutes, so $wgCopyUploadTimeout should still be the controlling timeout for these types of requests. Doing upload by URL via the job queue (async mode) would be ideal but it is currently broken. See T119336 for details on that. Bug: T118887 Change-Id: Ie33ae3b6a6cb757fe1b2a644e4361ea029789440 --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f644d24..9c07ba4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11484,6 +11484,12 @@ 'testwiki' => true, // T73897 'commonswiki' => true, // T73897 ), +'wgCopyUploadTimeout' => array( + // This is set to a high value because there is no working mechanism for + // uploading by URL asyncronously (via the job queue, for example). + // See T119336 for details. + 'default' => 90, // T118887 +), 'wgCopyUploadsDomains' => array( 'default' => array( '*.flickr.com', '*.staticflickr.com', ), // For Flickr uploads via UploadWizard - 2012-11-20 -- To view, visit https://gerrit.wikimedia.org/r/254700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie33ae3b6a6cb757fe1b2a644e4361ea029789440 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Brian Wolff <bawolff...@gmail.com> Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com> Gerrit-Reviewer: CSteipp <cste...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits