Adjust memory_hard_limit

References: https://www.nomadproject.io/docs/drivers/docker#memory_hard_limit hashicorp/nomad#8087 femiwiki/femiwiki#116 (comment)
femiwiki · Dec 27, 2020 · cc93e51 · cc93e51
1 parent 3405f34
commit cc93e51
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 44 deletions.
diff --git a/nomad/development.nomad b/nomad/development.nomad
@@ -34,6 +34,12 @@ job "mediawiki" {
         volumes = [
           "local/Caddyfile:/srv/femiwiki.com/Caddyfile"
         ]
+
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 80
       }
 
       template {
@@ -66,10 +72,6 @@ EOF
 
         destination = "local/Caddyfile"
       }
-
-      resources {
-        memory = 256
-      }
     }
 
     network {
@@ -120,17 +122,18 @@ EOF
 
       config {
         image = "ghcr.io/femiwiki/mediawiki:latest"
+        memory_hard_limit = 600
+      }
+
+      resources {
+        memory = 80
       }
 
       volume_mount {
         volume      = "configs"
         destination = "/a"
         read_only   = true
       }
-
-      resources {
-        memory = 256
-      }
     }
 
     network {
@@ -176,6 +179,11 @@ EOF
       config {
         image = "mysql:8.0"
         args  = ["--default-authentication-plugin=mysql_native_password"]
+        memory_hard_limit = 1000
+      }
+
+      resources {
+        memory = 500
       }
 
       env {
@@ -184,10 +192,6 @@ EOF
         MYSQL_USER          = "DB_USERNAME" // secret.php.example에 적힌 기본값
         MYSQL_PASSWORD      = "DB_PASSWORD" // secret.php.example에 적힌 기본값
       }
-
-      resources {
-        memory = 1024
-      }
     }
 
     network {
@@ -210,10 +214,11 @@ EOF
 
       config {
         image = "memcached:1-alpine"
+        memory_hard_limit = 240
       }
 
       resources {
-        memory = 256
+        memory = 60
       }
     }
 
@@ -237,6 +242,11 @@ EOF
 
       config {
         image = "ghcr.io/femiwiki/parsoid:2020-09-05T10-03-ae442600"
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 120
       }
 
       env {
@@ -245,10 +255,6 @@ EOF
         # Avoid using NOMAD_UPSTREAM_ADDR_http https://github.com/femiwiki/nomad/issues/1
         MEDIAWIKI_APIS_URI    = "http://localhost/api.php"
       }
-
-      resources {
-        memory = 1024
-      }
     }
 
     network {
@@ -278,6 +284,11 @@ EOF
 
       config {
         image = "ghcr.io/femiwiki/restbase:2020-09-05T10-04-5dcdc8b6"
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 100
       }
 
       env {
@@ -287,10 +298,6 @@ EOF
         PARSOID_URI           = "http://${NOMAD_UPSTREAM_ADDR_parsoid}"
         MATHOID_URI           = "http://${NOMAD_UPSTREAM_ADDR_mathoid}"
       }
-
-      resources {
-        memory = 1024
-      }
     }
 
     network {
@@ -331,10 +338,11 @@ EOF
 
       config {
         image = "wikimedia/mathoid:bad5ec8d4"
+        memory_hard_limit = 600
       }
 
       resources {
-        memory = 1024
+        memory = 150
       }
     }
 

diff --git a/nomad/production.nomad b/nomad/production.nomad
@@ -30,16 +30,18 @@ job "mediawiki" {
             readonly = false
           }
         ]
+
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 80
       }
 
       env {
         FASTCGI_ADDR  = "${NOMAD_UPSTREAM_ADDR_fastcgi}"
         RESTBASE_ADDR = "${NOMAD_UPSTREAM_ADDR_restbase}"
       }
-
-      resources {
-        memory = 32
-      }
     }
 
     network {
@@ -122,6 +124,12 @@ job "mediawiki" {
             readonly = false
           }
         ]
+
+        memory_hard_limit = 600
+      }
+
+      resources {
+        memory = 80
       }
 
       artifact {
@@ -141,10 +149,6 @@ job "mediawiki" {
         destination = "/a/secret.php"
         read_only = true
       }
-
-      resources {
-        memory = 110
-      }
     }
 
     network {
@@ -207,6 +211,11 @@ job "mediawiki" {
           "--default-authentication-plugin=mysql_native_password",
           "--datadir", "/srv/mysql"
         ]
+        memory_hard_limit = 1000
+      }
+
+      resources {
+        memory = 500
       }
 
       volume_mount {
@@ -224,10 +233,6 @@ job "mediawiki" {
       env {
         MYSQL_RANDOM_ROOT_PASSWORD = "yes"
       }
-
-      resources {
-        memory = 512
-      }
     }
 
     network {
@@ -256,10 +261,11 @@ job "mediawiki" {
 
       config {
         image = "memcached:1.6.6-alpine"
+        memory_hard_limit = 240
       }
 
       resources {
-        memory = 80
+        memory = 60
       }
     }
 
@@ -289,6 +295,11 @@ job "mediawiki" {
 
       config {
         image = "ghcr.io/femiwiki/parsoid:2020-09-05T10-03-ae442600"
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 120
       }
 
       env {
@@ -297,10 +308,6 @@ job "mediawiki" {
         # Avoid using NOMAD_UPSTREAM_ADDR_http https://github.com/femiwiki/nomad/issues/1
         MEDIAWIKI_APIS_URI    = "http://localhost/api.php"
       }
-
-      resources {
-        memory = 150
-      }
     }
 
     network {
@@ -345,6 +352,12 @@ job "mediawiki" {
             readonly = false
           }
         ]
+
+        memory_hard_limit = 400
+      }
+
+      resources {
+        memory = 100
       }
 
       env {
@@ -354,10 +367,6 @@ job "mediawiki" {
         PARSOID_URI           = "http://${NOMAD_UPSTREAM_ADDR_parsoid}"
         MATHOID_URI           = "http://${NOMAD_UPSTREAM_ADDR_mathoid}"
       }
-
-      resources {
-        memory = 128
-      }
     }
 
     network {
@@ -404,10 +413,11 @@ job "mediawiki" {
 
       config {
         image = "wikimedia/mathoid:bad5ec8d4"
+        memory_hard_limit = 600
       }
 
       resources {
-        memory = 128
+        memory = 150
       }
     }