Ryan Lane has submitted this change and it was merged.
Change subject: Reduce salt call timeout to 1s for fetch/checkout
......................................................................
Reduce salt call timeout to 1s for fetch/checkout
On a timeout salt will continue running a job in the background.
Since we're using a returner we don't need to wait for the salt
master to return any data back to the peer. By timing out as soon
as possible we can reduce the salt overhead of a deploy by 29
seconds per stage.
Change-Id: Ie1e5f503f90cf0cb898dcad87693ac322dad2324
---
M modules/deployment/files/runners/deploy.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/files/runners/deploy.py
b/modules/deployment/files/runners/deploy.py
index f2582c2..cc1954d 100755
--- a/modules/deployment/files/runners/deploy.py
+++ b/modules/deployment/files/runners/deploy.py
@@ -32,7 +32,7 @@
cmd = 'deploy.fetch'
# comma in the tuple is a workaround for a bug in salt
arg = (repo,)
- client.cmd(grain, cmd, expr_form='grain', arg=arg, timeout=30,
+ client.cmd(grain, cmd, expr_form='grain', arg=arg, timeout=1,
ret='deploy_redis')
print "Fetch completed"
@@ -48,6 +48,6 @@
client = salt.client.LocalClient(__opts__['conf_file'])
cmd = 'deploy.checkout'
arg = (repo, reset)
- client.cmd(grain, cmd, expr_form='grain', arg=arg, timeout=30,
+ client.cmd(grain, cmd, expr_form='grain', arg=arg, timeout=1,
ret='deploy_redis')
print "Checkout completed"
--
To view, visit https://gerrit.wikimedia.org/r/91809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1e5f503f90cf0cb898dcad87693ac322dad2324
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
