Merge pull request #31 from totem/develop

0.3.5 Release
totem · Aug 14, 2015 · 756a322 · 756a322
2 parents 15078c5 + e370076
commit 756a322
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/conf/appconfig.py b/conf/appconfig.py
@@ -90,6 +90,8 @@
     }
 }
 
+DEFAULT_STOP_TIMEOUT = '30s'
+
 DEPLOYMENT_DEFAULTS = {
     DEPLOYMENT_TYPE_GIT_QUAY: {
         'deployment': {
@@ -134,7 +136,7 @@
                 'timeout': '10s'
             },
             'stop': {
-                'timeout': '30s',
+                'timeout': DEFAULT_STOP_TIMEOUT,
                 'check-retries':
                 TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
             }

diff --git a/deployer/__init__.py b/deployer/__init__.py
@@ -3,7 +3,7 @@
 from celery.signals import setup_logging
 
 
-__version__ = '0.3.3'
+__version__ = '0.3.5'
 __author__ = 'sukrit'
 
 deployer.logger.init_logging()

diff --git a/deployer/tasks/deployment.py b/deployer/tasks/deployment.py
@@ -240,6 +240,9 @@ def delete(name, version=None):
     return _using_lock.si(
         search_params, name,
         do_task=(
+            _fleet_stop.si(name, version=version) |
+            _wait_for_stop.si(name, version=version,
+                              search_params=search_params) |
             _fleet_undeploy.si(name, version) |
             _wait_for_undeploy.si(name, version, search_params=search_params)
         )
@@ -607,6 +610,8 @@ def _pre_create_undeploy(deployment, search_params, next_task=None):
         return next_task.delay() if next_task else None
     name = deployment['deployment']['name']
     undeploy_chain = [
+        _fleet_stop.si(name, version=version) |
+        _wait_for_stop.si(name, version=version, search_params=search_params) |
         _fleet_undeploy.si(name, version, ignore_error=False),
         _wait_for_undeploy.si(name, version, search_params=search_params)
     ]
@@ -656,7 +661,7 @@ def _fleet_stop(self, name, version=None, exclude_version=None,
     :return: ret_value
     """
     try:
-        stop(get_fleet_provider(), name, version,
+        stop(get_fleet_provider(), name, version=version,
              exclude_version=exclude_version)
     except RETRYABLE_FLEET_EXCEPTIONS as exc:
         raise self.retry(exc=exc, max_retries=TASK_SETTINGS['SSH_RETRIES'],

diff --git a/schemas/app-version-v1.json b/schemas/app-version-v1.json
@@ -125,7 +125,7 @@
         "timeout": {
           "type": "string",
           "description": "Deployment stop timeout represented in terms of seconds or minutes. e.g: 30s for timeout of 30 seconds. The application will be sent SIGTERM signal and will have this time for its cleanup.",
-          "default": "30s"
+          "default": "120s"
         },
         "check-retries": {
           "type": "number",

diff --git a/tests/unit/tasks/test_deployment.py b/tests/unit/tasks/test_deployment.py
@@ -9,7 +9,7 @@
 
 from conf.appconfig import DEPLOYMENT_MODE_BLUEGREEN, \
     DEPLOYMENT_MODE_REDGREEN, DEPLOYMENT_STATE_STARTED, \
-    NOTIFICATIONS_DEFAULTS, TASK_SETTINGS
+    NOTIFICATIONS_DEFAULTS, TASK_SETTINGS, DEFAULT_STOP_TIMEOUT
 from conf.celeryconfig import CLUSTER_NAME
 from deployer.celery import app
 from deployer.tasks.exceptions import NodeNotUndeployed, MinNodesNotRunning, \
@@ -26,6 +26,7 @@
 
 
 NOW = datetime.datetime(2014, 01, 01)
+DEFAULT_STOP_TIMEOUT_SECONDS = 30
 
 
 def test_create():
@@ -114,7 +115,7 @@ def test_deployment_defaults_for_type_git_quay(mock_time):
                 'timeout': '10s'
             },
             'stop': {
-                'timeout': '30s',
+                'timeout': DEFAULT_STOP_TIMEOUT,
                 'check-retries':
                 TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
             }
@@ -131,7 +132,7 @@ def test_deployment_defaults_for_type_git_quay(mock_time):
                     'image': 'quay.io/totem/testowner-testrepo:testcommit',
                     'sidekicks': ['yoda-register'],
                     'service': {
-                        'container-stop-sec': 30
+                        'container-stop-sec': DEFAULT_STOP_TIMEOUT_SECONDS
                     }
                 },
                 'enabled': True,
@@ -227,7 +228,7 @@ def test_deployment_defaults_with_proxy(mock_time):
                 'timeout': '10s'
             },
             'stop': {
-                'timeout': '30s',
+                'timeout': DEFAULT_STOP_TIMEOUT,
                 'check-retries':
                 TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
             }
@@ -246,7 +247,7 @@ def test_deployment_defaults_with_proxy(mock_time):
                     'image': 'quay.io/totem/testowner-testrepo:testcommit',
                     'sidekicks': ['yoda-register'],
                     'service': {
-                        'container-stop-sec': 30
+                        'container-stop-sec': DEFAULT_STOP_TIMEOUT_SECONDS
                     }
                 },
                 'enabled': True,
@@ -359,7 +360,7 @@ def test_deployment_defaults_for_type_git_quay_with_overrides(mock_time):
                 'timeout': '10s'
             },
             'stop': {
-                'timeout': '30s',
+                'timeout': DEFAULT_STOP_TIMEOUT,
                 'check-retries':
                 TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
             }
@@ -376,7 +377,7 @@ def test_deployment_defaults_for_type_git_quay_with_overrides(mock_time):
                     'image': 'quay.io/totem/testowner-testrepo:testcommit',
                     'sidekicks': ['yoda-register'],
                     'service': {
-                        'container-stop-sec': 30
+                        'container-stop-sec': DEFAULT_STOP_TIMEOUT_SECONDS
                     }
                 },
                 'enabled': True,
@@ -470,7 +471,7 @@ def test_deployment_defaults_for_custom_deployment(mock_time):
                 'timeout': '10s'
             },
             'stop': {
-                'timeout': '30s',
+                'timeout': DEFAULT_STOP_TIMEOUT,
                 'check-retries':
                 TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
             }
@@ -485,7 +486,7 @@ def test_deployment_defaults_for_custom_deployment(mock_time):
                         'DISCOVER_HEALTH': '{}'
                     },
                     'service': {
-                        'container-stop-sec': 30
+                        'container-stop-sec': DEFAULT_STOP_TIMEOUT_SECONDS
                     },
                     'sidekicks': []
                 },
@@ -524,7 +525,9 @@ def mock_callback():  # pragma: no cover
 
 @patch('deployer.tasks.deployment.undeploy')
 @patch('deployer.tasks.deployment.fetch_runtime_units')
-def test_pre_create_undeploy_for_red_green(mock_filter_units, mock_undeploy):
+@patch('deployer.tasks.deployment.stop')
+def test_pre_create_undeploy_for_red_green(m_stop, mock_filter_units,
+                                           mock_undeploy):
     """
     Should un-deploy all versions for mode: red-green
     """
@@ -544,11 +547,15 @@ def test_pre_create_undeploy_for_red_green(mock_filter_units, mock_undeploy):
     # Then: All versions of application are un-deployed.
     mock_undeploy.assert_called_with(ANY, deployment['deployment']['name'],
                                      None, exclude_version=None)
+    m_stop.assert_called_with(ANY, deployment['deployment']['name'],
+                              version=None, exclude_version=None)
 
 
 @patch('deployer.tasks.deployment.undeploy')
 @patch('deployer.tasks.deployment.fetch_runtime_units')
-def test_pre_create_undeploy_for_blue_green(mock_filter_units, mock_undeploy):
+@patch('deployer.tasks.deployment.stop')
+def test_pre_create_undeploy_for_blue_green(m_stop, mock_filter_units,
+                                            mock_undeploy):
     """
     Should undeploy all versions for mode: red-green
     """
@@ -569,11 +576,15 @@ def test_pre_create_undeploy_for_blue_green(mock_filter_units, mock_undeploy):
     mock_undeploy.assert_called_with(ANY, deployment['deployment']['name'],
                                      deployment['deployment']['version'],
                                      exclude_version=None)
+    m_stop.assert_called_with(
+        ANY, deployment['deployment']['name'],
+        version=deployment['deployment']['version'], exclude_version=None)
 
 
 @patch('deployer.tasks.deployment.undeploy')
 @patch('deployer.tasks.deployment.fetch_runtime_units')
-def test_pre_create_undeploy_for_ab(mock_filter_units, mock_undeploy):
+@patch('deployer.tasks.deployment.stop')
+def test_pre_create_undeploy_for_ab(m_stop, mock_filter_units, mock_undeploy):
     """
     Should undeploy all versions for mode: red-green
     """
@@ -592,6 +603,7 @@ def test_pre_create_undeploy_for_ab(mock_filter_units, mock_undeploy):
 
     # Then: All versions of application are un-deployed.
     mock_undeploy.assert_not_called()
+    m_stop.assert_not_called()
 
 
 @raises(NodeNotUndeployed)