BBlack has uploaded a new change for review.

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

Change subject: move $mmaN down to 2layer where it belongs
......................................................................

move $mmaN down to 2layer where it belongs

Change-Id: Ia5f4a0f22d6f2dc0d71074faff357a1c9b9505af
---
M modules/role/manifests/cache/2layer.pp
M modules/role/manifests/cache/base.pp
2 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/204513/1

diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 7ea9b89..300b103 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -55,6 +55,20 @@
         $backend_scaled_weights = [ { backend_match => '.', weight => 100 } ]
     }
 
+    # mma: mmap addrseses for fixed persistent storage on x86_64 Linux:
+    #  This scheme fits 4x fixed memory mappings of up to 4TB each
+    #  into the range 0x500000000000 - 0x5FFFFFFFFFFF, which on
+    #  x86_64 Linux is in the middle of the user address space and thus
+    #  unlikely to ever be used by normal, auto-addressed allocations,
+    #  as those grow in from the edges (typically from the top, but
+    #  possibly from the bottom depending).  Regardless of which
+    #  direction heap grows from, there's 32TB or more for normal
+    #  allocations to chew through before they reach our fixed range.
+    $mma0 = 0x500000000000
+    $mma1 = 0x540000000000
+    $mma2 = 0x580000000000
+    $mma3 = 0x5C0000000000
+
     # Ganglia monitoring
     if $::role::cache::configuration::has_ganglia{
         class { 'varnish::monitoring::ganglia':
diff --git a/modules/role/manifests/cache/base.pp 
b/modules/role/manifests/cache/base.pp
index 9d1cf98..1f28e39 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -25,20 +25,6 @@
         'labs'       => ['vdb'],
     }
 
-    # mma: mmap addrseses for fixed persistent storage on x86_64 Linux:
-    #  This scheme fits 4x fixed memory mappings of up to 4TB each
-    #  into the range 0x500000000000 - 0x5FFFFFFFFFFF, which on
-    #  x86_64 Linux is in the middle of the user address space and thus
-    #  unlikely to ever be used by normal, auto-addressed allocations,
-    #  as those grow in from the edges (typically from the top, but
-    #  possibly from the bottom depending).  Regardless of which
-    #  direction heap grows from, there's 32TB or more for normal
-    #  allocations to chew through before they reach our fixed range.
-    $mma0 = 0x500000000000
-    $mma1 = 0x540000000000
-    $mma2 = 0x580000000000
-    $mma3 = 0x5C0000000000
-
     # These regexes are for optimization of PURGE traffic by having
     #   non-upload sites ignore upload purges and having upload
     #   ignore everything but upload purges via purge_host_regex

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5f4a0f22d6f2dc0d71074faff357a1c9b9505af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to