Merge pull request #3359 from deis/revert-3214-disable_swap

Revert "feat(controller): disable swap usage if there is a memory limit"

Author: mboersma

controller/deis/settings.py

@@ -6,7 +6,6 @@
 import os.path
 import random
 import string
-import semantic_version
 import sys
 import tempfile
 
@@ -341,12 +340,3 @@
 if os.path.exists('/templates/confd_settings.py'):
     sys.path.append('/templates')
     from confd_settings import *  # noqa
-
-
-DOCKER_VERSION = os.environ.get('DOCKER_VERSION', '1.4.1')
-
-DISABLE_SWAP = ""
-
-if (semantic_version.validate(DOCKER_VERSION) and
-        semantic_version.Version(DOCKER_VERSION) >= semantic_version.Version('1.5.0')):
-    DISABLE_SWAP = "--memory-swap=-1"

controller/requirements.txt

@@ -16,7 +16,6 @@ paramiko==1.15.2
 psycopg2==2.6
 python-etcd==0.3.2
 PyYAML==3.11
-semantic_version==2.3.1
 setproctitle==1.1.8
 static==1.1.1
 South==1.0.2

controller/scheduler/fleet.py

@@ -129,7 +129,7 @@ def _create_container(self, name, image, command, unit, **kwargs):
         # prepare memory limit for the container type
         mem = kwargs.get('memory', {}).get(l['c_type'], None)
         if mem:
-            l.update({'memory': '-m {} {} '.format(mem.lower(), settings.DISABLE_SWAP)})
+            l.update({'memory': '-m {}'.format(mem.lower())})
         else:
             l.update({'memory': ''})
         # prepare memory limit for the container type

deisctl/units/deis-controller.service

@@ -8,7 +8,7 @@ EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-controller >/dev/null 2>&1 && docker rm -f deis-controller || true"
-ExecStart=/bin/sh -c "DOCKER_VERSION=`docker -v | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/'` && IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e EXTERNAL_PORT=8000 -e HOST=$COREOS_PRIVATE_IPV4 -e DOCKER_VERSION=$DOCKER_VERSION -v /var/run/fleet.sock:/var/run/fleet.sock -v /var/lib/deis/store:/data $IMAGE"
+ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e EXTERNAL_PORT=8000 -e HOST=$COREOS_PRIVATE_IPV4 -v /var/run/fleet.sock:/var/run/fleet.sock -v /var/lib/deis/store:/data $IMAGE"
 ExecStopPost=-/usr/bin/docker rm -f deis-controller
 Restart=on-failure
 RestartSec=5

docs/docs_requirements.txt

@@ -30,6 +30,3 @@ termcolor==1.1.0
 # Deis documentation requirements
 Sphinx==1.3.0
 smartypants==1.8.6
-
-# Deis controller requirements
-semantic_version==2.3.1