Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/349380 )
Change subject: Add separated SRV records for etcd to consume for conftool ...................................................................... Add separated SRV records for etcd to consume for conftool This both allows us to separate reads and writes, and potentially send reads to the nearest datacenter instead than to the master. Bug: T159687 Change-Id: Ibd102777dc2020593f94fade7b5d0dfe3cac49a1 --- M templates/wmnet 1 file changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/80/349380/1 diff --git a/templates/wmnet b/templates/wmnet index 530fb06..862f6d6 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -75,12 +75,19 @@ labsdb-web 5M IN CNAME dbproxy1011.eqiad.wmnet. ; etcd records +; server _etcd-server._tcp 5M IN SRV 0 1 2380 conf1001.eqiad.wmnet. _etcd-server._tcp 5M IN SRV 0 1 2380 conf1002.eqiad.wmnet. _etcd-server._tcp 5M IN SRV 0 1 2380 conf1003.eqiad.wmnet. +; All read clients _etcd._tcp 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. +; Conftool (RW) +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. + ; kubernetes-related records (etcd) _etcd-server._tcp.k8s 5M IN SRV 0 1 2380 etcd1001.eqiad.wmnet. @@ -2332,10 +2339,15 @@ syslog 1H IN CNAME wezen.codfw.wmnet. udplog 1H IN CNAME mwlog1001.eqiad.wmnet. -; etcd client discovery +; etcd client RO discovery _etcd._tcp 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. + +; Conftool (RW) +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. ; etcd server discovery _etcd-server._tcp 5M IN SRV 0 1 2380 conf2001.codfw.wmnet. @@ -4184,10 +4196,16 @@ puppet 1H IN CNAME puppetmaster1001.eqiad.wmnet. webproxy 5M IN CNAME install1002.wikimedia.org. -; etcd client discovery +; etcd client discovery (RO) _etcd._tcp 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. + +; Conftool (RW) +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. + ; puppet records _x-puppet-ca._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet. @@ -4376,11 +4394,16 @@ puppet 5M IN CNAME puppetmaster2001.codfw.wmnet. webproxy 5M IN CNAME install2002.wikimedia.org. -; etcd client discovery +; etcd client discovery (RO) _etcd._tcp 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. _etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. +; Conftool (RW) +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet. +_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet. + ; puppet records _x-puppet-ca._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet. _x-puppet._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/349380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd102777dc2020593f94fade7b5d0dfe3cac49a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
