From 307c57df143bc19fd45be9a63c9dd10d0e932d14 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Tue, 10 Jul 2018 14:27:49 +0200 Subject: [PATCH] Update ports used by dcos-net --- 1.11/installing/ports.md | 18 ++++------ 1.11/overview/architecture/components.md | 42 ++++++++++++------------ 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/1.11/installing/ports.md b/1.11/installing/ports.md index 27a9017e5..0a40a6c78 100644 --- a/1.11/installing/ports.md +++ b/1.11/installing/ports.md @@ -16,20 +16,16 @@ DC/OS allocates additional ports to services running on top of DC/OS. These port | Port | DC/OS component | systemd unit | |---|---|---| | 61003 | REX-Ray | `dcos-rexray.service` | -| 61053 | Mesos DNS | `dcos-mesos-dns.service` | -| 61420 | Erlang Port Mapping Daemon (EPMD) | `dcos-epmd.service` | -| 62053 | DNS Forwarder (Spartan) | `dcos-spartan.service` | -| 62080 | Navstar | `dcos-navstar.service` | -| 62501 | DNS Forwarder (Spartan) | `dcos-spartan.service` | -| 62502 | Navstar | `dcos-navstar.service` | +| 61420 | Erlang Port Mapping Daemon (EPMD) | `dcos-net.service` | +| 62080 | DC/OS net (Navstar) | `dcos-net.service` | +| 62501 | DNS Forwarder (Spartan) | `dcos-net.service` | ### UDP | Port | DC/OS component | systemd unit | |---|---|---| -| 61053 | Mesos DNS | `dcos-mesos-dns.service`| -| 62053 | DNS Forwarder (Spartan) | `dcos-spartan.service` | -| 64000 | Navstar | `dcos-navstar.service` | +| 62053 | DNS Forwarder (Spartan) | `dcos-net.service` | +| 64000 | Navstar | `dcos-net.service` | ## Master @@ -37,7 +33,7 @@ DC/OS allocates additional ports to services running on top of DC/OS. These port | Port | DC/OS component | systemd unit | |---|---|---| -| 53 | DNS Forwarder (Spartan) | `dcos-spartan.service` | +| 53 | DNS Forwarder (Spartan) | `dcos-net.service` | | 80 | Admin Router Master (HTTP) | `dcos-adminrouter.service` | | 443 | Admin Router Master (HTTPS) | `dcos-adminrouter.service` | | 1337 | DC/OS Secrets | `dcos-secrets.service` (Enterprise DC/OS Only) | @@ -65,7 +61,7 @@ DC/OS allocates additional ports to services running on top of DC/OS. These port | Port | DC/OS component | systemd unit | |---|---|---| -| 53 | DNS Forwarder (Spartan) | `dcos-spartan.service` | +| 53 | DNS Forwarder (Spartan) | `dcos-net.service` | ## Agent diff --git a/1.11/overview/architecture/components.md b/1.11/overview/architecture/components.md index 16e5827a1..98f47d846 100644 --- a/1.11/overview/architecture/components.md +++ b/1.11/overview/architecture/components.md @@ -421,21 +421,20 @@ In a world where machines are are given numbers instead of names, tasks are sche
-

DNS Forwarder (Spartan)

+

DNS Net (Spartan)

-

Description: DNS Forwarder (Spartan) forwards DNS requests to multiple DNS servers. Spartan Watchdog restarts Spartan when it is unhealthy.

+

Description: DNS Net (Spartan) forwards DNS requests to multiple DNS servers. Spartan Watchdog restarts Spartan when it is unhealthy.

System Service(s):

    -
  • dcos-spartan.service
    • -
  • dcos-spartan-watchdog.service
    • -
  • dcos-spartan-watchdog.timer
    • +
  • dcos-net.service
    • +
  • dcos-net-watchdog.service

See Also:

@@ -637,10 +636,11 @@ To see a list of the systemd components running on any particular node, list the ``` $ ls /etc/systemd/system/dcos.target.wants/ -1 dcos-adminrouter.service +dcos-checks-poststart.service +dcos-checks-poststart.timer dcos-cosmos.service dcos-diagnostics.service dcos-diagnostics.socket -dcos-epmd.service dcos-exhibitor.service dcos-gen-resolvconf.service dcos-gen-resolvconf.timer @@ -655,14 +655,12 @@ dcos-mesos-master.service dcos-metrics-master.service dcos-metrics-master.socket dcos-metronome.service -dcos-navstar.service +dcos-net.service +dcos-net-watchdog.service dcos-oauth.service dcos-pkgpanda-api.service dcos-signal.service dcos-signal.timer -dcos-spartan.service -dcos-spartan-watchdog.service -dcos-spartan-watchdog.timer ``` ## Private Agent Node @@ -670,11 +668,12 @@ dcos-spartan-watchdog.timer ``` $ ls /etc/systemd/system/dcos.target.wants/ -1 dcos-adminrouter-agent.service +dcos-checks-poststart.service +dcos-checks-poststart.timer dcos-diagnostics.service dcos-diagnostics.socket dcos-docker-gc.service dcos-docker-gc.timer -dcos-epmd.service dcos-gen-resolvconf.service dcos-gen-resolvconf.timer dcos-log-agent.service @@ -684,13 +683,11 @@ dcos-logrotate-agent.timer dcos-mesos-slave.service dcos-metrics-agent.service dcos-metrics-agent.socket -dcos-navstar.service +dcos-net.service +dcos-net-watchdog.service dcos-pkgpanda-api.service dcos-rexray.service dcos-signal.timer -dcos-spartan.service -dcos-spartan-watchdog.service -dcos-spartan-watchdog.timer ``` ## Public Agent Node @@ -698,11 +695,12 @@ dcos-spartan-watchdog.timer ``` $ ls /etc/systemd/system/dcos.target.wants/ -1 dcos-adminrouter-agent.service +dcos-checks-poststart.service +dcos-checks-poststart.timer dcos-diagnostics.service dcos-diagnostics.socket dcos-docker-gc.service dcos-docker-gc.timer -dcos-epmd.service dcos-gen-resolvconf.service dcos-gen-resolvconf.timer dcos-log-agent.service @@ -712,13 +710,11 @@ dcos-logrotate-agent.timer dcos-mesos-slave-public.service dcos-metrics-agent.service dcos-metrics-agent.socket -dcos-navstar.service +dcos-net.service +dcos-net-watchdog.service dcos-pkgpanda-api.service dcos-rexray.service dcos-signal.timer -dcos-spartan.service -dcos-spartan-watchdog.service -dcos-spartan-watchdog.timer ``` @@ -726,3 +722,7 @@ dcos-spartan-watchdog.timer - [Admin Router](#admin-router) - Admin Router now performs dynamic DNS resolution. The external `dcos-adminrouter-reload` service and timer were removed. - [DC/OS Component Package Manager](#dcos-component-package-manager) - To avoid a race condition during DC/OS upgrades, the DC/OS Component Package Manager socket file is now managed by [gunicorn](http://gunicorn.org/) instead of systemd. + +# Changes Since DC/OS 1.10 + +- [`dcos-net`] The role of `dcos-net` was fulfilled by `spartan`, `dcos-l4lb` was fulfilled by `minuteman` and `dcos-overlay` was fulfilled by `navstar`. In DC/OS 1.11, the different systemD units were aggregated into a single service. The main advantage of following this operational pattern is that it has led to better efficiency in terms of resource utilization (lower CPU consumption and lower memory), and has also made the networking services a lot more robust and reliable, not to mention that this approach has made the code a lot more maintainable.