Remove ignoreHttp1xx (#317)

* upstream merge * add http basic auth support * add haproxy acme plugin * fix some missing/extra labels * Revert "add haproxy acme plugin" This reverts commit 15e7a25. * upstream merge * add http basic auth support * add haproxy acme plugin * fix some missing/extra labels * Revert "add haproxy acme plugin" This reverts commit 15e7a25. * mesos http healthcheck does not support ignoreHttp1xx, remove it.
d2iq-archive · Sep 21, 2016 · 1713471 · 1713471
1 parent c5f0459
commit 1713471
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 68 deletions.
diff --git a/Longhelp.md b/Longhelp.md
@@ -155,7 +155,6 @@ Parameters of the first health check for this service are exposed as:
   * healthCheckPath
   * healthCheckTimeoutSeconds
   * healthCheckIntervalSeconds
-  * healthCheckIgnoreHttp1xx
   * healthCheckGracePeriodSeconds
   * healthCheckMaxConsecutiveFailures
   * healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1
@@ -228,7 +227,6 @@ Parameters of the first health check for this service are exposed as:
   * healthCheckPath
   * healthCheckTimeoutSeconds
   * healthCheckIntervalSeconds
-  * healthCheckIgnoreHttp1xx
   * healthCheckGracePeriodSeconds
   * healthCheckMaxConsecutiveFailures
   * healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1

diff --git a/README.md b/README.md
@@ -352,4 +352,4 @@ PRs are welcome, but here are a few general guidelines:
 
    ```
    bash /path/to/marathon-lb/scripts/install-git-hooks.sh
-   ```
+   ```
diff --git a/config.py b/config.py
@@ -578,7 +578,6 @@ def load(self):
   * healthCheckPath
   * healthCheckTimeoutSeconds
   * healthCheckIntervalSeconds
-  * healthCheckIgnoreHttp1xx
   * healthCheckGracePeriodSeconds
   * healthCheckMaxConsecutiveFailures
   * healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1
@@ -655,7 +654,6 @@ def load(self):
   * healthCheckPath
   * healthCheckTimeoutSeconds
   * healthCheckIntervalSeconds
-  * healthCheckIgnoreHttp1xx
   * healthCheckGracePeriodSeconds
   * healthCheckMaxConsecutiveFailures
   * healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1

diff --git a/marathon_lb.py b/marathon_lb.py
@@ -334,7 +334,6 @@ def _get_health_check_options(template, health_check, health_check_port):
         healthCheckPath=health_check.get('path', '/'),
         healthCheckTimeoutSeconds=health_check['timeoutSeconds'],
         healthCheckIntervalSeconds=health_check['intervalSeconds'],
-        healthCheckIgnoreHttp1xx=health_check['ignoreHttp1xx'],
         healthCheckGracePeriodSeconds=health_check['gracePeriodSeconds'],
         healthCheckMaxConsecutiveFailures=health_check[
             'maxConsecutiveFailures'],

diff --git a/tests/test_marathon_lb.py b/tests/test_marathon_lb.py
@@ -164,8 +164,7 @@ def test_config_simple_app(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -223,8 +222,7 @@ def test_config_healthcheck_command(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -272,8 +270,7 @@ def test_config_simple_app_vhost(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -332,8 +329,7 @@ def test_config_simple_app_multiple_vhost(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -394,8 +390,7 @@ def test_config_simple_app_vhost_and_redirect(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -455,8 +450,7 @@ def test_config_simple_app_multiple_vhost_and_redirect(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -518,8 +512,7 @@ def test_config_simple_app_vhost_with_auth(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -590,8 +583,7 @@ def test_config_simple_app_multiple_vhost_and_auth(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -667,8 +659,7 @@ def test_config_simple_app_vhost_with_path_and_auth(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -742,8 +733,7 @@ def test_config_simple_app_multiple_vhost_with_path_and_auth(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -823,8 +813,7 @@ def test_config_simple_app_vhost_with_path(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -886,8 +875,7 @@ def test_config_simple_app_multiple_vhost_with_path(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -952,8 +940,7 @@ def test_config_simple_app_vhost_with_path_and_redirect(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com"
@@ -1017,8 +1004,7 @@ def test_config_simple_app_multiple_vhost_with_path_and_redirect(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -1085,8 +1071,7 @@ def test_config_simple_app_multiple_vhost_path_redirect_hsts(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -1155,8 +1140,7 @@ def test_config_simple_app_balance(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.balance = "leastconn"
@@ -1268,8 +1252,7 @@ def test_config_simple_app_healthcheck_port(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -1324,8 +1307,7 @@ def test_config_simple_app_healthcheck_port_using_another_portindex(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -1399,8 +1381,7 @@ def test_config_simple_app_healthcheck_port_diff_portindex_and_group(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -1481,8 +1462,7 @@ def test_config_simple_app_healthcheck_port_portindex_out_of_range(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -1555,8 +1535,7 @@ def test_config_simple_app_tcp_healthcheck(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.groups = ['external']
@@ -1951,8 +1930,7 @@ def test_config_multi_app_multiple_vhost_with_path(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.hostname = "test.example.com,test"
@@ -2101,8 +2079,7 @@ def test_config_haproxy_map(self):
             "gracePeriodSeconds": 15,
             "intervalSeconds": 3,
             "timeoutSeconds": 15,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
 
         app1 = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
@@ -2207,8 +2184,7 @@ def test_config_haproxy_map_hybrid(self):
             "gracePeriodSeconds": 15,
             "intervalSeconds": 3,
             "timeoutSeconds": 15,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
 
         app1 = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
@@ -2319,8 +2295,7 @@ def test_config_haproxy_map_hybrid_with_vhost_path(self):
             "gracePeriodSeconds": 15,
             "intervalSeconds": 3,
             "timeoutSeconds": 15,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
 
         app1 = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
@@ -2434,8 +2409,7 @@ def test_config_haproxy_map_hybrid_httptohttps_redirect(self):
             "gracePeriodSeconds": 15,
             "intervalSeconds": 3,
             "timeoutSeconds": 15,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
 
         app1 = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
@@ -2544,8 +2518,7 @@ def test_config_simple_app_proxypass_health_check(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.proxypath = "/proxy/path"
@@ -2603,8 +2576,7 @@ def test_config_simple_app_revproxy_health_check(self):
             "gracePeriodSeconds": 10,
             "intervalSeconds": 2,
             "timeoutSeconds": 10,
-            "maxConsecutiveFailures": 10,
-            "ignoreHttp1xx": False
+            "maxConsecutiveFailures": 10
         }
         app = marathon_lb.MarathonService('/nginx', 10000, healthCheck)
         app.revproxypath = "/proxy/path"

diff --git a/tests/zdd_app_blue.json b/tests/zdd_app_blue.json
@@ -60,8 +60,7 @@
           "gracePeriodSeconds":15,
           "intervalSeconds":3,
           "timeoutSeconds":15,
-          "maxConsecutiveFailures":10,
-          "ignoreHttp1xx":false
+          "maxConsecutiveFailures":10
         }
       ],
       "dependencies":[

diff --git a/tests/zdd_apps.json b/tests/zdd_apps.json
@@ -60,8 +60,7 @@
           "gracePeriodSeconds":15,
           "intervalSeconds":3,
           "timeoutSeconds":15,
-          "maxConsecutiveFailures":10,
-          "ignoreHttp1xx":false
+          "maxConsecutiveFailures":10
         }
       ],
       "dependencies":[
@@ -245,8 +244,7 @@
           "gracePeriodSeconds":15,
           "intervalSeconds":3,
           "timeoutSeconds":15,
-          "maxConsecutiveFailures":10,
-          "ignoreHttp1xx":false
+          "maxConsecutiveFailures":10
         }
       ],
       "dependencies":[
-Original file line number
+Diff line change
@@ Expand Up / @@ -352,4 +352,4 @@ PRs are welcome, but here are a few general guidelines: @@
        ```
        bash /path/to/marathon-lb/scripts/install-git-hooks.sh
-       ```
+       ```