Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

Remove ignoreHttp1xx #317

Merged
merged 17 commits into from
Sep 21, 2016
Merged

Remove ignoreHttp1xx #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cf2faf2
upstream merge
vixns Apr 6, 2016
cb6802b
add http basic auth support
vixns Apr 7, 2016
dfc5bd8
Merge branch 'master' of https://github.com/mesosphere/marathon-lb
vixns Apr 7, 2016
1ed1dbe
Merge branch 'master' of https://github.com/mesosphere/marathon-lb
vixns Apr 19, 2016
15e7a25
add haproxy acme plugin
vixns Apr 19, 2016
f39bbc1
fix some missing/extra labels
vixns Apr 20, 2016
2159226
Revert "add haproxy acme plugin"
vixns Apr 20, 2016
76ab7ea
upstream merge
vixns Apr 6, 2016
b201678
add http basic auth support
vixns Apr 7, 2016
b0f036f
add haproxy acme plugin
vixns Apr 19, 2016
804339b
fix some missing/extra labels
vixns Apr 20, 2016
3d74e60
Revert "add haproxy acme plugin"
vixns Apr 20, 2016
a4f9da6
Merge branch 'master' of github.com:vixns/marathon-lb
vixns Apr 27, 2016
4d1003f
Merge branch 'master' of https://github.com/mesosphere/marathon-lb
vixns May 26, 2016
7ddef20
Merge branch 'master' of https://github.com/mesosphere/marathon-lb
vixns Jul 30, 2016
8cfc138
Merge branch 'master' of https://github.com/mesosphere/marathon-lb
vixns Sep 20, 2016
5af4b07
mesos http healthcheck does not support ignoreHttp1xx, remove it.
vixns Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Longhelp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,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
Expand Down Expand Up @@ -229,7 +228,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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff 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
```
```
2 changes: 0 additions & 2 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,6 @@ def load(self):
* healthCheckPath
* healthCheckTimeoutSeconds
* healthCheckIntervalSeconds
* healthCheckIgnoreHttp1xx
* healthCheckGracePeriodSeconds
* healthCheckMaxConsecutiveFailures
* healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1
Expand Down Expand Up @@ -655,7 +654,6 @@ def load(self):
* healthCheckPath
* healthCheckTimeoutSeconds
* healthCheckIntervalSeconds
* healthCheckIgnoreHttp1xx
* healthCheckGracePeriodSeconds
* healthCheckMaxConsecutiveFailures
* healthCheckFalls is set to healthCheckMaxConsecutiveFailures + 1
Expand Down
1 change: 0 additions & 1 deletion marathon_lb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
84 changes: 28 additions & 56 deletions tests/test_marathon_lb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions tests/zdd_app_blue.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
"gracePeriodSeconds":15,
"intervalSeconds":3,
"timeoutSeconds":15,
"maxConsecutiveFailures":10,
"ignoreHttp1xx":false
"maxConsecutiveFailures":10
}
],
"dependencies":[
Expand Down
6 changes: 2 additions & 4 deletions tests/zdd_apps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
"gracePeriodSeconds":15,
"intervalSeconds":3,
"timeoutSeconds":15,
"maxConsecutiveFailures":10,
"ignoreHttp1xx":false
"maxConsecutiveFailures":10
}
],
"dependencies":[
Expand Down Expand Up @@ -245,8 +244,7 @@
"gracePeriodSeconds":15,
"intervalSeconds":3,
"timeoutSeconds":15,
"maxConsecutiveFailures":10,
"ignoreHttp1xx":false
"maxConsecutiveFailures":10
}
],
"dependencies":[
Expand Down