[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "upload: splay restart cron ever betterer"

2016-09-17 Thread BBlack (Code Review)
BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311236

Change subject: Revert "upload: splay restart cron ever betterer"
..

Revert "upload: splay restart cron ever betterer"

This reverts commit 2eb4b4c4fe189824a110a7ddca2f0783dbccd6a0.

Change-Id: Ied2bdc8d8df9cdd0b729bde6f52063a208d754c3
---
M modules/role/manifests/cache/upload.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/311236/1

diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index 4f52320..908f7ad 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -131,7 +131,7 @@
 }
 
 # XXX: temporary, we need this to mitigate T145661
-$rt_parts = split(inline_template("<%= require 'digest/md5'; x = 
Digest::MD5.hexdigest(@fqdn).to_i(16) % 1440; hh = x / 60; mm = x % 60; 
hh.to_s() + ':' + mm.to_s(); %>"), ':')
+$rt_parts = split(inline_template("<%= require 'digest/md5'; x = 
Random.new(Digest::MD5.hexdigest(@fqdn).to_i(16)).rand(1440); hh = x / 60; mm = 
x % 60; hh.to_s() + ':' + mm.to_s(); %>"), ':')
 $be_restart_h = $rt_parts[0]
 $be_restart_m = $rt_parts[1]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/311236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied2bdc8d8df9cdd0b729bde6f52063a208d754c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "upload: splay restart cron ever betterer"

2016-09-17 Thread BBlack (Code Review)
BBlack has submitted this change and it was merged.

Change subject: Revert "upload: splay restart cron ever betterer"
..


Revert "upload: splay restart cron ever betterer"

This reverts commit 2eb4b4c4fe189824a110a7ddca2f0783dbccd6a0.

Change-Id: Ied2bdc8d8df9cdd0b729bde6f52063a208d754c3
---
M modules/role/manifests/cache/upload.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index 4f52320..908f7ad 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -131,7 +131,7 @@
 }
 
 # XXX: temporary, we need this to mitigate T145661
-$rt_parts = split(inline_template("<%= require 'digest/md5'; x = 
Digest::MD5.hexdigest(@fqdn).to_i(16) % 1440; hh = x / 60; mm = x % 60; 
hh.to_s() + ':' + mm.to_s(); %>"), ':')
+$rt_parts = split(inline_template("<%= require 'digest/md5'; x = 
Random.new(Digest::MD5.hexdigest(@fqdn).to_i(16)).rand(1440); hh = x / 60; mm = 
x % 60; hh.to_s() + ':' + mm.to_s(); %>"), ':')
 $be_restart_h = $rt_parts[0]
 $be_restart_m = $rt_parts[1]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/311236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2bdc8d8df9cdd0b729bde6f52063a208d754c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits