BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/204755
Change subject: get rid of realm conditionals on $memory_storage_size ...................................................................... get rid of realm conditionals on $memory_storage_size (and incidentally, improve accuracy of upload memory_storage_size calculation for large memory sizes) Change-Id: Idebbf01bc4dc82616905f7841e46d23e1a333e95 --- M modules/role/manifests/cache/bits.pp M modules/role/manifests/cache/mobile.pp M modules/role/manifests/cache/text.pp M modules/role/manifests/cache/upload.pp 4 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/204755/1 diff --git a/modules/role/manifests/cache/bits.pp b/modules/role/manifests/cache/bits.pp index 5ae8237..20339f7 100644 --- a/modules/role/manifests/cache/bits.pp +++ b/modules/role/manifests/cache/bits.pp @@ -43,7 +43,7 @@ } $cluster_options = merge($common_cluster_options, $realm_cluster_options) - if $::realm == 'production' { + if $::memorysize_mb >= 16384 { $memory_storage_size = 2 } else { diff --git a/modules/role/manifests/cache/mobile.pp b/modules/role/manifests/cache/mobile.pp index 87245a3..4485193 100644 --- a/modules/role/manifests/cache/mobile.pp +++ b/modules/role/manifests/cache/mobile.pp @@ -4,7 +4,7 @@ $mobile_nodes = hiera('cache::mobile::nodes') $site_mobile_nodes = $mobile_nodes[$::site] - if $::realm == 'production' { + if $::memorysize_mb >= 16384 { $memory_storage_size = floor((0.125 * $::memorysize_mb / 1024.0) + 0.5) # 1/8 of total mem } else { diff --git a/modules/role/manifests/cache/text.pp b/modules/role/manifests/cache/text.pp index 41e429c..28570a8 100644 --- a/modules/role/manifests/cache/text.pp +++ b/modules/role/manifests/cache/text.pp @@ -4,7 +4,7 @@ $text_nodes = hiera('cache::text::nodes') $site_text_nodes = $text_nodes[$::site] - if $::realm == 'production' { + if $::memorysize_mb >= 16384 { $memory_storage_size = floor((0.125 * $::memorysize_mb / 1024.0) + 0.5) # 1/8 of total mem } else { diff --git a/modules/role/manifests/cache/upload.pp b/modules/role/manifests/cache/upload.pp index 04e14f3..94eb247 100644 --- a/modules/role/manifests/cache/upload.pp +++ b/modules/role/manifests/cache/upload.pp @@ -4,8 +4,8 @@ $upload_nodes = hiera('cache::upload::nodes') $site_upload_nodes = $upload_nodes[$::site] - if $::realm == 'production' { - $memory_storage_size = floor((0.083 * $::memorysize_mb / 1024.0) + 0.5) # 1/12 of total mem + if $::memorysize_mb >= 24576 { + $memory_storage_size = floor((0.08333 * $::memorysize_mb / 1024.0) + 0.5) # 1/12 of total mem } else { $memory_storage_size = 1 -- To view, visit https://gerrit.wikimedia.org/r/204755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idebbf01bc4dc82616905f7841e46d23e1a333e95 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits