memory limits added

SeldonIO · Jun 5, 2017 · 835cd4b · 835cd4b
1 parent e3dd248
commit 835cd4b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/docker/iago/start-load-test.sh b/docker/iago/start-load-test.sh
@@ -16,7 +16,7 @@ rm -f replay.txt
 ln -s ${REPLAY} replay.txt
 
 cat web.ramp-up.scala.in | sed 's/%REQ_RATE%/'${REQ_RATE}'/' > web.ramp-up.scala
-java -jar iago-0.6.14.jar -f web.ramp-up.scala
+java -Xmx3000M -jar iago-0.6.14.jar -f web.ramp-up.scala
 
 
 
diff --git a/kubernetes/conf/Makefile b/kubernetes/conf/Makefile
@@ -23,9 +23,9 @@ SELDON_SERVICE_TYPE=LoadBalancer
 
 SELDON_SERVER_SERVICE_TYPE=NodePort
 
-GRAFANA_ADMIN_PASSWORD=uY4nev2c
+GRAFANA_ADMIN_PASSWORD=admin
 SPARK_UI_USERNAME=spark
-SPARK_UI_PASSWORD=uY4nev2c
+SPARK_UI_PASSWORD=spark
 
 GOOGLE_SQL_INSTANCE=
 
@@ -51,7 +51,7 @@ create_sparkui_secret:spark.htpasswd
 # 
 # Default Resources (edit for your own needs)
 #
-SELDON_SERVER_RESOURCES="requests":{ "memory" : "3Gi" }
+SELDON_SERVER_RESOURCES="requests":{ "memory" : "3Gi" },"limits":{ "memory" : "3Gi"}
 MYSQL_RESOURCES="requests":{ "memory" : "3Gi" }
 MEMCACHE_RESOURCES="requests":{ "memory" : "260Mi" }
 

diff --git a/kubernetes/conf/analytics/impressions-kafka-stream.json.in b/kubernetes/conf/analytics/impressions-kafka-stream.json.in
@@ -28,6 +28,7 @@
                     {
                         "command": [
                             "java",
+			    "-Xmx400M",
                             "-cp",
                             "seldon-stream-%SELDON_STREAM_VERSION%-jar-with-dependencies.jar",
                             "io.seldon.stream.analytics.ImpressionsToInfluxDb",
@@ -47,7 +48,11 @@
                         "image": "seldonio/seldon-stream:%SELDON_STREAM_BUILD_IMAGE_VERSION%",
                         "imagePullPolicy": "IfNotPresent",
                         "name": "kafka-streaming-impressions",
-                        "terminationMessagePath": "/dev/termination-log"
+                        "terminationMessagePath": "/dev/termination-log",
+			"resources": {
+			    "requests":{ "memory" : "500M" },
+			    "limits":{ "memory" : "500M"}
+			}
                     }
                 ],
                 "terminationGracePeriodSeconds": 0

diff --git a/kubernetes/conf/analytics/predictions-kafka-stream.json.in b/kubernetes/conf/analytics/predictions-kafka-stream.json.in
@@ -28,6 +28,7 @@
                     {
                         "command": [
                             "java",
+			    "-Xmx400M",
                             "-cp",
                             "seldon-stream-%SELDON_STREAM_VERSION%-jar-with-dependencies.jar",
                             "io.seldon.stream.analytics.PredictionsToInfluxDb",
@@ -45,8 +46,11 @@
                         "image": "seldonio/seldon-stream:%SELDON_STREAM_BUILD_IMAGE_VERSION%",
                         "imagePullPolicy": "IfNotPresent",
                         "name": "kafka-streaming-predictions",
-                        "terminationMessagePath": "/dev/termination-log"
-                    }
+                        "terminationMessagePath": "/dev/termination-log",
+			"resources": {
+			    "requests":{ "memory" : "500M" },
+			    "limits":{ "memory" : "500M"}
+			}                    }
                 ],
                 "terminationGracePeriodSeconds": 0
             }

diff --git a/kubernetes/conf/spark-master.json.in b/kubernetes/conf/spark-master.json.in
@@ -57,7 +57,10 @@
                                         "protocol": "TCP"
                                     }
                                 ],
-                                "resources": {},
+				"resources": {
+				    "requests":{ "memory" : "2G" },
+				    "limits":{ "memory" : "2G"}
+				},
                                 "volumeMounts": [
                                     {
                                         "name": "data-volume",

diff --git a/kubernetes/conf/spark-workers.json.in b/kubernetes/conf/spark-workers.json.in
@@ -45,6 +45,10 @@
                                 "protocol": "TCP"
                             }
                         ],
+			"resources": {
+			    "requests":{ "memory" : "2G" },
+			    "limits":{ "memory" : "2G"}
+			},
                         "volumeMounts": [
                             {
                                 "name": "data-volume",