diff --git a/source/initial-dns-seedlist-discovery/tests/README.rst b/source/initial-dns-seedlist-discovery/tests/README.rst index 0e6404aa5b..0c332b67a1 100644 --- a/source/initial-dns-seedlist-discovery/tests/README.rst +++ b/source/initial-dns-seedlist-discovery/tests/README.rst @@ -14,8 +14,9 @@ replica set name ``repl0``. The tests in the ``load-balanced`` directory MUST be executed against a load-balanced sharded cluster with the mongos servers running on localhost ports -27017 and 27018 (corresponding to the script in `drivers-evergreen-tools`_). The -load balancers, shard servers, and config servers may run on any open ports. +27017 and 27018 and ``--loadBalancerPort`` 27050 and 27051, respectively +(corresponding to the script in `drivers-evergreen-tools`_). The load balancers, +shard servers, and config servers may run on any open ports. .. _`drivers-evergreen-tools`: https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/run-load-balancer.sh @@ -56,7 +57,9 @@ these tests:: _mongodb._tcp.test19.test.build.10gen.cc. 86400 IN SRV 27017 localhost.test.build.10gen.cc. _mongodb._tcp.test20.test.build.10gen.cc. 86400 IN SRV 27017 localhost.test.build.10gen.cc. _mongodb._tcp.test21.test.build.10gen.cc. 86400 IN SRV 27017 localhost.test.build.10gen.cc. - _customname._tcp.test22.test.build.10gen.cc 86400 IN SRV 27017 localhost.test.build.10gen.cc + _customname._tcp.test22.test.build.10gen.cc 86400 IN SRV 27017 localhost.test.build.10gen.cc. + _mongodb._tcp.test23.test.build.10gen.cc. 86400 IN SRV 8000 localhost.test.build.10gen.cc. + _mongodb._tcp.test24.test.build.10gen.cc. 86400 IN SRV 8000 localhost.test.build.10gen.cc. Record TTL Class Text test5.test.build.10gen.cc. 86400 IN TXT "replicaSet=repl0&authSource=thisDB" @@ -68,12 +71,18 @@ these tests:: test11.test.build.10gen.cc. 86400 IN TXT "replicaS" "et=rep" "l0" test20.test.build.10gen.cc. 86400 IN TXT "loadBalanced=true" test21.test.build.10gen.cc. 86400 IN TXT "loadBalanced=false" - -Note that ``test4`` is omitted deliberately to test what happens with no SRV -record. ``test9`` is missing because it was deleted during the development of -the tests. The missing ``test.`` sub-domain in the SRV record target for -``test12`` is deliberate. ``test22`` is used to test a custom service name -(``customname``). + test24.test.build.10gen.cc. 86400 IN TXT "loadBalanced=true" + +Notes: + +- ``test4`` is omitted deliberately to test what happens with no SRV record. +- ``test9`` is missing because it was deleted during the development of the + tests. +- The missing ``test.`` sub-domain in the SRV record target for ``test12`` is + deliberate. +- ``test22`` is used to test a custom service name (``customname``). +- ``test23`` and ``test24`` point to port 8000 (HAProxy) and are used for + load-balanced tests. In our tests we have used ``localhost.test.build.10gen.cc`` as the domain, and then configured ``localhost.test.build.10gen.cc`` to resolve to 127.0.0.1. diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.json index 7f41932bb2..3f500acdc6 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.json @@ -1,10 +1,10 @@ { - "uri": "mongodb+srv://test20.test.build.10gen.cc/?directConnection=false", + "uri": "mongodb+srv://test24.test.build.10gen.cc/?directConnection=false", "seeds": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "hosts": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "options": { "loadBalanced": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.yml index 0c96f352c2..c8395f7786 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-directConnection.yml @@ -1,12 +1,12 @@ -# The TXT record for test20.test.build.10gen.cc contains loadBalanced=true. +# The TXT record for test24.test.build.10gen.cc contains loadBalanced=true. # DRIVERS-1721 introduced this test as passing. -uri: "mongodb+srv://test20.test.build.10gen.cc/?directConnection=false" +uri: "mongodb+srv://test24.test.build.10gen.cc/?directConnection=false" seeds: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 hosts: # In LB mode, the driver does not do server discovery, so the hostname does - # not get resolved to localhost:27017. - - localhost.test.build.10gen.cc:27017 + # not get resolved to localhost:8000. + - localhost.test.build.10gen.cc:8000 options: loadBalanced: true ssl: true diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.json index 9ed5ff22c2..2133dee532 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.json @@ -1,5 +1,5 @@ { - "uri": "mongodb+srv://test20.test.build.10gen.cc/?replicaSet=replset", + "uri": "mongodb+srv://test24.test.build.10gen.cc/?replicaSet=replset", "seeds": [], "hosts": [], "error": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.yml index 208c6a9739..896f7de7b5 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-replicaSet-errors.yml @@ -1,5 +1,5 @@ -# The TXT record for test20.test.build.10gen.cc contains loadBalanced=true. -uri: "mongodb+srv://test20.test.build.10gen.cc/?replicaSet=replset" +# The TXT record for test24.test.build.10gen.cc contains loadBalanced=true. +uri: "mongodb+srv://test24.test.build.10gen.cc/?replicaSet=replset" seeds: [] hosts: [] error: true diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.json index 0117b3e9cb..f9719e760d 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.json @@ -1,10 +1,10 @@ { - "uri": "mongodb+srv://test20.test.build.10gen.cc/", + "uri": "mongodb+srv://test24.test.build.10gen.cc/", "seeds": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "hosts": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "options": { "loadBalanced": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.yml index bbf9e8c599..a172bda52b 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/loadBalanced-true-txt.yml @@ -1,10 +1,10 @@ -uri: "mongodb+srv://test20.test.build.10gen.cc/" +uri: "mongodb+srv://test24.test.build.10gen.cc/" seeds: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 hosts: # In LB mode, the driver does not do server discovery, so the hostname does - # not get resolved to localhost:27017. - - localhost.test.build.10gen.cc:27017 + # not get resolved to localhost:8000. + - localhost.test.build.10gen.cc:8000 options: loadBalanced: true ssl: true diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json index a7600a8a7b..593a521c26 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json @@ -1,5 +1,5 @@ { - "uri": "mongodb+srv://test20.test.build.10gen.cc/?srvMaxHosts=1", + "uri": "mongodb+srv://test24.test.build.10gen.cc/?srvMaxHosts=1", "seeds": [], "hosts": [], "error": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml index bf0636039c..01379cd205 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml @@ -1,4 +1,4 @@ -uri: "mongodb+srv://test20.test.build.10gen.cc/?srvMaxHosts=1" +uri: "mongodb+srv://test24.test.build.10gen.cc/?srvMaxHosts=1" seeds: [] hosts: [] error: true diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.json index 8d48b5bbb9..a18360ea64 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.json @@ -1,10 +1,10 @@ { - "uri": "mongodb+srv://test20.test.build.10gen.cc/?srvMaxHosts=0", + "uri": "mongodb+srv://test24.test.build.10gen.cc/?srvMaxHosts=0", "seeds": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "hosts": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "options": { "loadBalanced": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.yml index 3ec00b574d..986164e3b9 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero-txt.yml @@ -1,9 +1,9 @@ # loadBalanced=true (TXT) is permitted because srvMaxHosts is non-positive -uri: "mongodb+srv://test20.test.build.10gen.cc/?srvMaxHosts=0" +uri: "mongodb+srv://test24.test.build.10gen.cc/?srvMaxHosts=0" seeds: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 hosts: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 options: loadBalanced: true srvMaxHosts: 0 diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.json b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.json index 2382fccf85..bd85418117 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.json +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.json @@ -1,10 +1,10 @@ { - "uri": "mongodb+srv://test3.test.build.10gen.cc/?loadBalanced=true&srvMaxHosts=0", + "uri": "mongodb+srv://test23.test.build.10gen.cc/?loadBalanced=true&srvMaxHosts=0", "seeds": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "hosts": [ - "localhost.test.build.10gen.cc:27017" + "localhost.test.build.10gen.cc:8000" ], "options": { "loadBalanced": true, diff --git a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.yml b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.yml index a8d3a19f36..7dc1593484 100644 --- a/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.yml +++ b/source/initial-dns-seedlist-discovery/tests/load-balanced/srvMaxHosts-zero.yml @@ -1,9 +1,9 @@ # loadBalanced=true is permitted because srvMaxHosts is non-positive -uri: "mongodb+srv://test3.test.build.10gen.cc/?loadBalanced=true&srvMaxHosts=0" +uri: "mongodb+srv://test23.test.build.10gen.cc/?loadBalanced=true&srvMaxHosts=0" seeds: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 hosts: - - localhost.test.build.10gen.cc:27017 + - localhost.test.build.10gen.cc:8000 options: loadBalanced: true srvMaxHosts: 0