Merge pull request #25 from phenixblue/gunicorn-testing

Move to Gunicorn WSGI Server

Author: phenixblue

CHANGELOG.md

@@ -18,3 +18,6 @@ This release contains several package updates geared towards fixing security rel
 
  The updated pyyaml package required updates to the Kubernetes Python client library, moving primary support to Kubernetes 1.15+. Backwards compatibility to Kubernetes 1.13 should exist, but isn't tested/gauranteed.
 
+## 2.1.3
+
+This release migrates to using the Gunicorn WSGI HTTP Server instead of the default Flask server. This change reduces average latency by about 75% in our normal benchmarking tests. THis change also means the standar 3 replica deployment can handle almost 3 times the request rate as before.

Makefile

@@ -16,7 +16,7 @@
 # its contributors may be used to endorse or promote products derived from this
 # software without specific prior written permission.
 
-MAGTAPE_VERSION := v2.1.2
+MAGTAPE_VERSION := v2.1.3
 OPA_VERSION := 0.19.2
 KUBE_MGMT_VERSION := 0.11
 
@@ -81,6 +81,12 @@ uninstall:
 	kubectl delete validatingwebhookconfiguration magtape-webhook
 	kubectl delete csr magtape-svc.magtape-system.cert-request
 
+# Restart Magtape Pods (Demo Install)
+.PHONY: restart
+restart:
+
+	kubectl rollout restart deploy magtape -n magtape-system
+
 # Cleanup MagTape (Demo Install)
 .PHONY: clean
 clean: uninstall
@@ -135,7 +141,7 @@ test-clean:
 
 # Run all unit and functional tests for MagTape/MagTape-Init
 .PHONY: test-all
-test-all: test test-functional-deployments
+test-all: test test-functional
 
 ###############################################################################
 # Misc Repo Targets ###########################################################

app/magtape/Dockerfile

@@ -13,6 +13,7 @@ RUN pip install pipenv
 RUN pipenv install --system --deploy
 
 COPY ./magtape.py /app/
+COPY ./config.py /app/
 
-CMD ["python", "magtape.py"]
+CMD ["gunicorn", "magtape:app", "--config=config.py"]
 

app/magtape/Pipfile

@@ -10,6 +10,8 @@ flask = "*"
 kubernetes = "~=11.0"
 prometheus-client = "*"
 prometheus-flask-exporter = "*"
+gunicorn = "*"
+werkzeug = "*"
 
 [requires]
 python_version = "3.8"

app/magtape/Pipfile.lock

@@ -0,0 +1,31 @@
+# Copyright 2020 T-Mobile, USA, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Trademark Disclaimer: Neither the name of T-Mobile, USA, Inc. nor the names of
+# its contributors may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+
+from os import environ as env
+import multiprocessing
+
+APP_PORT = int(env.get("APP_PORT", 5000))
+APP_DEBUG = int(env.get("APP_DEBUG", 1))
+magtape_tls_path = "/tls"
+
+# Gunicorn config
+bind = ":" + str(APP_PORT)
+workers = multiprocessing.cpu_count() * 2 + 1
+threads = 2 * multiprocessing.cpu_count()
+certfile = magtape_tls_path + "/cert.pem"
+keyfile = magtape_tls_path + "/key.pem"

app/magtape/config.py

@@ -53,7 +53,6 @@
 cluster = os.environ["MAGTAPE_CLUSTER_NAME"]
 magtape_namespace_name = os.environ["MAGTAPE_NAMESPACE_NAME"]
 magtape_pod_name = os.environ["MAGTAPE_POD_NAME"]
-magtape_tls_path = "/tls"
 
 # Set Slack related variables
 slack_enabled = os.environ["MAGTAPE_SLACK_ENABLED"]
@@ -716,7 +715,10 @@ def main():
         port=5000,
         debug=False,
         threaded=True,
-        ssl_context=(f"{magtape_tls_path}/cert.pem", f"{magtape_tls_path}/key.pem"),
+        ssl_context=(
+            f"{config.magtape_tls_path}/cert.pem",
+            f"{config.magtape_tls_path}/key.pem",
+        ),
     )
 
 

app/magtape/magtape.py

@@ -315,7 +315,7 @@ spec:
       serviceAccountName: magtape-sa
       initContainers:
         - name: magtape-init
-          image: tmobile/magtape-init:v2.1.2
+          image: tmobile/magtape-init:v2.1.3
           command: [/app/magtape-init.py]
           imagePullPolicy: Always
           env:
@@ -337,10 +337,10 @@ spec:
             mountPath: /vwc
       containers:
       - name: magtape
-        image: tmobile/magtape:v2.1.2
+        image: tmobile/magtape:v2.1.3
         ports:
         - containerPort: 5000
-        command: [/app/magtape.py]
+        command: ["gunicorn", "magtape:app", "--config=config.py"]
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

deploy/install.yaml

@@ -18,7 +18,7 @@ spec:
       serviceAccountName: magtape-sa
       initContainers:
         - name: magtape-init
-          image: tmobile/magtape-init:v2.1.2
+          image: tmobile/magtape-init:v2.1.3
           command: [/app/magtape-init.py]
           imagePullPolicy: Always
           env:
@@ -40,10 +40,10 @@ spec:
             mountPath: /vwc
       containers:
       - name: magtape
-        image: tmobile/magtape:v2.1.2
+        image: tmobile/magtape:v2.1.3
         ports:
         - containerPort: 5000
-        command: [/app/magtape.py]
+        command: ["gunicorn", "magtape:app", "--config=config.py"]
         imagePullPolicy: Always
         livenessProbe:
           httpGet: