jenkins-bot has submitted this change and it was merged.
Change subject: Update timeout values
......................................................................
Update timeout values
* Reduce Parsoid request timeout to 110s.
* Bump down heartbeat timeout to 115s as well.
* Increase batch API timeout to 65s.
Bug: T152073
Change-Id: I8e83dd16c4ad0fe9b617899be97e3571f8b4bdfb
---
M scap/templates/config.yaml.j2
1 file changed, 14 insertions(+), 8 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
GWicke: Looks good to me, but someone else must approve
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 5e36d4c..1c64b4a 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -8,8 +8,12 @@
worker_heap_limit_mb: 800
# The maximum interval in ms that can pass between two beat messages
-# sent by each worker to the master before it is killed
-worker_heartbeat_timeout: 180000
+# sent by each worker to the master before it is killed.
+#
+# This is slightly larger than the request timeout so the request is
+# guaranteed to use its full 110s time allocation to complete its
+# parse while contending for cpu time with other concurrent requests.
+worker_heartbeat_timeout: 115000
# Logger info
logging:
@@ -44,10 +48,12 @@
useBatchAPI: true
usePHPPreProcessor: true
- # RESTBase uses 2 minutes timeouts for the first request
- # and a higher value subsequently.
- #
- # Set a 3 minute timeout so that RESTBase retries have
- # a chance of succeeding.
timeouts:
- request: 180000 # 3 minutes
+ # RESTBase uses a 2 minute timeout for the first request.
+ #
+ # Set ours to 110s so we time out before RB times out and retries.
+ # This prevents RB from retrying slow requests altogether.
+ request: 110000
+ mwApi:
+ # Bump batch timeout to 65s (higher than MW API timeout of 60s)
+ batch: 65000
--
To view, visit https://gerrit.wikimedia.org/r/325708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e83dd16c4ad0fe9b617899be97e3571f8b4bdfb
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
