summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/gotools/Godeps2
-rw-r--r--src/mongo/gotools/common.yml194
-rw-r--r--src/mongo/gotools/common/db/openssl/testdata/ca.pem80
-rw-r--r--src/mongo/gotools/common/db/openssl/testdata/server.pem78
-rw-r--r--src/mongo/gotools/import.data2
-rw-r--r--src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/harness/mongojs/init.js2
-rw-r--r--src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session.go8
-rw-r--r--src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session_test.go42
8 files changed, 241 insertions, 167 deletions
diff --git a/src/mongo/gotools/Godeps b/src/mongo/gotools/Godeps
index 175622a4ece..aaea510c2de 100644
--- a/src/mongo/gotools/Godeps
+++ b/src/mongo/gotools/Godeps
@@ -1,4 +1,4 @@
-gopkg.in/mgo.v2 bb6c39e69bb0cf5be3dcabfce2613da30f42fad5 github.com/10gen/mgo
+gopkg.in/mgo.v2 913983c541c4a010f8cbe5505dc8dc992a4e8370 github.com/10gen/mgo
gopkg.in/tomb.v2 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
github.com/jtolds/gls 8ddce2a84170772b95dd5d576c48d517b22cac63
github.com/jacobsa/oglematchers 3ecefc49db07722beca986d9bb71ddd026b133f0
diff --git a/src/mongo/gotools/common.yml b/src/mongo/gotools/common.yml
index 18ff49d737f..fe419d94608 100644
--- a/src/mongo/gotools/common.yml
+++ b/src/mongo/gotools/common.yml
@@ -19,9 +19,11 @@ mongo_tools_variables:
- name: legacy30
# No SSL on 2.6 for osx
# - name: legacy26
- - name: qa-tests
- name: qa-tests-3.2
- name: qa-tests-3.4
+ - name: qa-tests-3.6
+ - name: qa-tests-4.0
+ - name: qa-tests-unstable
- name: qa-dump-restore-gzip
- name: qa-dump-restore-gzip-3.2
- name: qa-dump-restore-archiving
@@ -37,10 +39,11 @@ mongo_tools_variables:
# - name: replay-replay_test
macos_1012_ssl_task_list: &macos_1012_ssl_tasks
- name: dist
- - name: qa-tests
+ - name: qa-tests-4.0
+ - name: qa-tests-unstable
- name: native-cert-ssl
- name: unit
- ubuntu1404_task_list: &ubuntu1404_tasks
+ ubuntu1404_x86_64_task_list: &ubuntu1404_x86_64_tasks
- name: db
- name: dist
- name: integration
@@ -48,9 +51,10 @@ mongo_tools_variables:
- name: legacy30
- name: lint-go
- name: lint-js
- - name: qa-tests
- name: qa-tests-3.2
- name: qa-tests-3.4
+ - name: qa-tests-3.6
+ - name: qa-tests-4.0
- name: qa-tests-unstable
- name: qa-dump-restore-gzip
- name: qa-dump-restore-gzip-3.2
@@ -65,15 +69,15 @@ mongo_tools_variables:
- name: replay-sharded_test
- name: replay-repl_test
- name: replay-replay_test
- ubuntu1404_ssl_task_list: &ubuntu1404_ssl_tasks
+ ubuntu1404_x86_64_ssl_task_list: &ubuntu1404_x86_64_ssl_tasks
- name: dist
- name: integration
- name: integration-auth
- name: legacy30
- - name: qa-tests
+ - name: qa-tests-4.0
- name: qa-tests-unstable
- name: native-cert-ssl
- ubuntu1404_enterprise_task_list: &ubuntu1404_enterprise_tasks
+ ubuntu1404_x86_64_enterprise_task_list: &ubuntu1404_x86_64_enterprise_tasks
- name: db
- name: dist
- name: integration
@@ -81,7 +85,8 @@ mongo_tools_variables:
- name: kerberos
- name: legacy30
- name: legacy26
- - name: qa-tests
+ - name: qa-tests-4.0
+ - name: qa-tests-unstable
- name: native-cert-ssl
- name: replay-dist
- name: replay-sanity_check
@@ -90,14 +95,14 @@ mongo_tools_variables:
- name: replay-sharded_test
- name: replay-repl_test
- name: replay-replay_test
- ubuntu1404_race_task_list: &ubuntu1404_race_tasks
+ ubuntu1404_x86_64_race_task_list: &ubuntu1404_x86_64_race_tasks
- name: db
- name: dist
- name: integration
- name: integration-auth
- name: legacy30
- name: legacy26
- - name: qa-tests
+ - name: qa-tests-4.0
- name: unit
- name: replay-dist
- name: replay-sanity_check
@@ -114,15 +119,18 @@ mongo_tools_variables:
- name: legacy30
distros:
- windows-64-vs2013-test
- - name: qa-tests
- distros:
- - windows-64-vs2013-test
- name: qa-tests-3.2
distros:
- windows-64-vs2013-test
- name: qa-tests-3.4
distros:
- windows-64-vs2013-test
+ - name: qa-tests-3.6
+ distros:
+ - windows-64-vs2013-test
+ - name: qa-tests-4.0
+ distros:
+ - windows-64-vs2013-test
- name: qa-dump-restore-archiving
distros:
- windows-64-vs2013-test
@@ -142,7 +150,8 @@ mongo_tools_variables:
- name: integration
- name: integration-auth
- name: legacy30
- - name: qa-tests
+ - name: qa-tests-4.0
+ - name: qa-tests-unstable
- name: native-cert-ssl
- name: unit
windows_64_enterprise_task_list: &windows_64_enterprise_tasks
@@ -154,12 +163,24 @@ mongo_tools_variables:
- name: legacy30
distros:
- windows-64-vs2013-test
- - name: qa-tests
+ - name: qa-tests-3.2
+ distros:
+ - windows-64-vs2013-test
+ - name: qa-tests-3.4
+ distros:
+ - windows-64-vs2013-test
+ - name: qa-tests-3.6
+ distros:
+ - windows-64-vs2013-test
+ - name: qa-tests-4.0
+ distros:
+ - windows-64-vs2013-test
+ - name: qa-tests-unstable
distros:
- windows-64-vs2013-test
- name: unit
- name: native-cert-ssl
- rhel71_enterprise_task_list: &rhel71_enterprise_tasks
+ rhel71_ppc64le_enterprise_task_list: &rhel71_ppc64le_enterprise_tasks
- name: db
- name: dist
- name: integration
@@ -167,7 +188,9 @@ mongo_tools_variables:
#- name: kerberos
- name: qa-dump-restore-archiving
- name: qa-dump-restore-gzip
- - name: qa-tests
+ - name: qa-tests-3.4
+ - name: qa-tests-3.6
+ - name: qa-tests-4.0
- name: qa-tests-unstable
- name: native-cert-ssl
# disabled until BUILD-2273 is done
@@ -178,7 +201,7 @@ mongo_tools_variables:
# - name: replay-sharded_test
# - name: replay-repl_test
# - name: replay-replay_test
- rhel72_enterprise_task_list: &rhel72_enterprise_tasks
+ rhel67_s390x_enterprise_task_list: &rhel67_s390x_enterprise_tasks
- name: db
- name: dist
- name: integration
@@ -186,6 +209,9 @@ mongo_tools_variables:
- name: kerberos
- name: qa-dump-restore-archiving
- name: qa-dump-restore-gzip
+ - name: qa-tests-3.4
+ - name: qa-tests-3.6
+ - name: qa-tests-4.0
- name: qa-tests-unstable
- name: native-cert-ssl
# disabled until BUILD-2273 is done
@@ -196,13 +222,16 @@ mongo_tools_variables:
# - name: replay-sharded_test
# - name: replay-repl_test
# - name: replay-replay_test
- ubuntu1604_ssl_task_list: &ubuntu1604_ssl_tasks
+ ubuntu1604_arm64_ssl_task_list: &ubuntu1604_arm64_ssl_tasks
- name: db
- name: dist
- name: integration
- name: integration-auth
- name: qa-dump-restore-archiving
- name: qa-dump-restore-gzip
+ - name: qa-tests-3.4
+ - name: qa-tests-3.6
+ - name: qa-tests-4.0
- name: qa-tests-unstable
- name: native-cert-ssl
@@ -824,7 +853,7 @@ tasks:
value: "${args} -test.types=db"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
- func: "wait for mongod to be ready"
- func: "setup integration test"
@@ -901,7 +930,7 @@ tasks:
value: "${args} -test.types=${integration_test_args}"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
- func: "wait for mongod to be ready"
- func: "run tool integration tests"
@@ -925,7 +954,7 @@ tasks:
value: "db.createUser({ user: '${auth_username}', pwd: '${auth_password}', roles: [{ role: '__system', db: 'admin' }] });"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
- func: "wait for mongod to be ready"
- func: "run tool integration tests"
@@ -1075,7 +1104,46 @@ tasks:
vars:
resmoke_suite: "core${resmoke_use_ssl}"
-- name: qa-tests
+- name: qa-tests-4.0
+ depends_on:
+ - name: dist
+ commands:
+ - func: "fetch source"
+ - func: "get buildnumber"
+ - func: "setup credentials"
+ - func: "download mongod"
+ vars:
+ mongo_version: "4.0"
+ - func: "fetch tool"
+ vars:
+ tool: mongoimport
+ - func: "fetch tool"
+ vars:
+ tool: mongoexport
+ - func: "fetch tool"
+ vars:
+ tool: mongodump
+ - func: "fetch tool"
+ vars:
+ tool: mongorestore
+ - func: "fetch tool"
+ vars:
+ tool: mongostat
+ - func: "fetch tool"
+ vars:
+ tool: mongotop
+ - func: "fetch tool"
+ vars:
+ tool: mongofiles
+ - func: "fetch tool"
+ vars:
+ tool: bsondump
+ - func: "run qa-tests"
+ vars:
+ resmoke_suite: "core${resmoke_use_ssl}"
+ excludes: "requires_unstable,${excludes}"
+
+- name: qa-tests-3.6
depends_on:
- name: dist
commands:
@@ -1201,7 +1269,7 @@ tasks:
- func: "setup credentials"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "fetch tool"
vars:
tool: mongoimport
@@ -1251,7 +1319,7 @@ tasks:
- func: "setup credentials"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "fetch tool"
vars:
tool: mongodump
@@ -1293,7 +1361,7 @@ tasks:
- func: "setup credentials"
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "fetch tool"
vars:
tool: mongodump
@@ -1407,7 +1475,7 @@ tasks:
tool: mongoreplay
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
- func: "wait for mongod to be ready"
- command: shell.exec
@@ -1437,7 +1505,7 @@ tasks:
pcapFname: getmore_single_channel.pcap
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
- func: "wait for mongod to be ready"
- func: "run go_test"
@@ -1462,7 +1530,7 @@ tasks:
pcapFname: getmore_single_channel.pcap
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "create sharded_cluster"
- func: "run go_test"
vars:
@@ -1486,7 +1554,7 @@ tasks:
pcapFname: getmore_single_channel.pcap
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "start mongod"
vars:
additional_args: --auth
@@ -1516,7 +1584,7 @@ tasks:
pcapFname: getmore_single_channel.pcap
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "create repl_set"
vars:
mongod_port: ${mongod_port}
@@ -1536,7 +1604,7 @@ tasks:
tool: mongoreplay
- func: "download mongod"
vars:
- mongo_version: "3.6"
+ mongo_version: "4.0"
- func: "fetch ftdc"
- command: shell.exec
params:
@@ -1566,7 +1634,7 @@ tasks:
buildvariants:
#######################################
-# Amazon Buildvariants #
+# Amazon x86_64 Buildvariants #
#######################################
- name: amazonlinux64
@@ -1590,19 +1658,9 @@ buildvariants:
- name: dist
#######################################
-# Debian Buildvariants #
+# Debian x86_64 Buildvariants #
#######################################
-- name: debian71
- display_name: Debian 7.1 (Go 1.8)
- run_on:
- - debian71-test
- expansions:
- gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
- build_tags: "sasl ssl"
- tasks:
- - name: dist
-
- name: debian81
display_name: Debian 8.1 (Go 1.8)
run_on:
@@ -1657,7 +1715,7 @@ buildvariants:
tasks: *macos_1012_ssl_tasks
#######################################
-# RHEL Buildvariants #
+# RHEL x86_64 Buildvariants #
#######################################
- name: rhel62
@@ -1681,7 +1739,7 @@ buildvariants:
- name: dist
#######################################
-# SUSE Buildvariants #
+# SUSE x86_64 Buildvariants #
#######################################
- name: suse12
@@ -1695,7 +1753,7 @@ buildvariants:
- name: dist
#######################################
-# Ubuntu Buildvariants #
+# Ubuntu x86_64 Buildvariants #
#######################################
- name: ubuntu1404
@@ -1712,7 +1770,7 @@ buildvariants:
arch: "linux/x86_64"
integration_test_args: integration
resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
- tasks: *ubuntu1404_tasks
+ tasks: *ubuntu1404_x86_64_tasks
- name: ubuntu1404-ssl
display_name: Ubuntu 14.04 SSL (Go 1.8)
@@ -1731,9 +1789,9 @@ buildvariants:
resmoke_use_ssl: _ssl
resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
integration_test_args: "integration,ssl"
- tasks: *ubuntu1404_ssl_tasks
+ tasks: *ubuntu1404_x86_64_ssl_tasks
-- name: ubuntu-enterprise
+- name: ubuntu1404-enterprise
display_name: Ubuntu 14.04 Enterprise (Go 1.8)
run_on:
- ubuntu1404-test
@@ -1751,7 +1809,7 @@ buildvariants:
run_kinit: true
integration_test_args: integration
resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
- tasks: *ubuntu1404_enterprise_tasks
+ tasks: *ubuntu1404_x86_64_enterprise_tasks
- name: ubuntu1604
display_name: Ubuntu 16.04 (Go 1.8)
@@ -1858,7 +1916,7 @@ buildvariants:
arch: "linux/arm64"
edition: ssl
integration_test_args: integration
- tasks: *ubuntu1604_ssl_tasks
+ tasks: *ubuntu1604_arm64_ssl_tasks
#######################################
# Power Buildvariants #
@@ -1888,7 +1946,7 @@ buildvariants:
edition: enterprise
run_kinit: true
integration_test_args: integration
- tasks: *rhel71_enterprise_tasks
+ tasks: *rhel71_ppc64le_enterprise_tasks
- name: ubuntu1604-ppc64le-enterprise
display_name: ZAP PPC64LE Ubuntu 16.04 Enterprise (Go 1.8)
@@ -1913,21 +1971,9 @@ buildvariants:
stepback: false
batchtime: 10080 # weekly
expansions:
- gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
- build_tags: "sasl ssl"
- tasks:
- - name: dist
-
-- name: rhel72-s390x-enterprise
- display_name: ZAP s390x RHEL 7.2 Enterprise (Go 1.8)
- run_on:
- - rhel72-zseries-test
- stepback: false
- batchtime: 10080 # weekly
- expansions:
<<: *mongod_default_startup_args
<<: *mongo_default_startup_args
- mongo_os: "rhel72"
+ mongo_os: "rhel67"
mongo_edition: "enterprise"
mongo_arch: "s390x"
build_tags: "sasl ssl"
@@ -1940,19 +1986,7 @@ buildvariants:
edition: enterprise
run_kinit: true
integration_test_args: integration
- tasks: *rhel72_enterprise_tasks
-
-- name: suse12-s390x-enterprise
- display_name: ZAP s390x SUSE 12 Enterprise (Go 1.8)
- run_on:
- - suse12-zseries-test
- stepback: false
- batchtime: 10080 # weekly
- expansions:
- gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
- build_tags: "sasl ssl"
- tasks:
- - name: dist
+ tasks: *rhel67_s390x_enterprise_tasks
- name: ubuntu1604-s390x-enterprise
display_name: ZAP s390x Ubuntu 16.04 Enterprise (Go 1.8)
@@ -1987,5 +2021,5 @@ buildvariants:
args: "-race"
excludes: requires_large_ram
integration_test_args: integration
- tasks: *ubuntu1404_race_tasks
+ tasks: *ubuntu1404_x86_64_race_tasks
diff --git a/src/mongo/gotools/common/db/openssl/testdata/ca.pem b/src/mongo/gotools/common/db/openssl/testdata/ca.pem
index b1b6f2628da..d1a5689cf0f 100644
--- a/src/mongo/gotools/common/db/openssl/testdata/ca.pem
+++ b/src/mongo/gotools/common/db/openssl/testdata/ca.pem
@@ -1,34 +1,48 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMbN8D5Au+xWdY+s
-GpUuSFSbHGzYfHmw0yajA9J8PiwDePRMl71OMMsByNsykjzXEr0BBOn4PNO6KW7K
-HdDicRavuC/iFucVpILUiJoLOUCPKb/EyAHUk0r2fdr3Ypd2ZXkD1EXmM9WTQnyW
-PEWqr1T7MmM9PhsD0r8ZbQVu8R49AgMBAAECgYBbC+mguQjXfektOUabV6zsgnUM
-LEElgiPRqAqSFTBr+9MjHwjHO84Ayvpv2MM8dcsxIAxeEr/Yv4NGJ+5rwajESir6
-/7UzqzhXmj6ylqTfbMRJCRsqnwvSfNwpsxtMSYieCxtdYqTLaJLAItBjuZPAYL8W
-9Tf/NMc4AjLLHx7PyQJBAOyOcIS/i23td6ZX+QtppXL1fF/JMiKooE9m/npAT5K/
-hQEaAatdLyQ669id181KY9F0JR1TEbzb0A1yo73soRsCQQDXJSG4ID8lfR9SXnEE
-y/RqYv0eKneER+V7e1Cy7bYHvJxZK0sWXYzIZhTl8PABh3PCoLdxjY0IM7UNWlwU
-dAuHAkAOUaTv9CQ9eDVY5VRW44M3TTLFHYmiXXCuvb5Dqibm7B7h7TASrmZPHB3w
-k8VfUNRv9kbU2pVlSCz0026j7XHnAkEAk/qZP8EGTe3K3mfRCsCSA57EhLwm6phd
-ElrWPcvc2WN0kqyBgAembqwwEZxwKE0XZTYQFw2KhKq0DFQrY3IR/wJAIAnLtabL
-aF819WI/VYlMmwb3GAO2w5KQilGhYl7tv1BghH+Qmg7HZEcIRmSwPKEQveT3YpCH
-nCu38jgPXhhqdg==
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIC3DCCAkWgAwIBAgIJAKwksc/otf2iMA0GCSqGSIb3DQEBCwUAMIGGMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxFjAUBgNVBAcMDU5ldyBZb3JrIENp
-dHkxHTAbBgNVBAoMFE1vbmdvREIgS2VybmVsIFRvb2xzMRkwFwYDVQQLDBBUb29s
-cyBUZXN0aW5nIENBMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTUwNjA1MTU1MTQ1
-WhcNMzUwNjA0MTU1MTQ1WjCBhjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZ
-b3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MR0wGwYDVQQKDBRNb25nb0RCIEtl
-cm5lbCBUb29sczEZMBcGA1UECwwQVG9vbHMgVGVzdGluZyBDQTESMBAGA1UEAwwJ
-bG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGzfA+QLvsVnWP
-rBqVLkhUmxxs2Hx5sNMmowPSfD4sA3j0TJe9TjDLAcjbMpI81xK9AQTp+DzTuilu
-yh3Q4nEWr7gv4hbnFaSC1IiaCzlAjym/xMgB1JNK9n3a92KXdmV5A9RF5jPVk0J8
-ljxFqq9U+zJjPT4bA9K/GW0FbvEePQIDAQABo1AwTjAdBgNVHQ4EFgQU+QOiCHTF
-8At8aMOBvHF6wWZpcZUwHwYDVR0jBBgwFoAU+QOiCHTF8At8aMOBvHF6wWZpcZUw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQCbbIAjdV+M8RR3ZF1WMBYD
-8aMr55kgtnCWn4mTCDdombCYgtbaPq5sy8Hb/2wLQ9Zl4UuFL5wKWcx3kOLo3cw/
-boj8jnUDnwrsBd2nN7sYdjF+M7FLp6U1AxrE5ejijtg2KCl+p4b7jJgJBSFIQD45
-7CAJVjIrajY4LlJj3x+caQ==
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgIBATANBgkqhkiG9w0BAQUFADB0MRcwFQYDVQQDEw5LZXJu
+ZWwgVGVzdCBDQTEPMA0GA1UECxMGS2VybmVsMRAwDgYDVQQKEwdNb25nb0RCMRYw
+FAYDVQQHEw1OZXcgWW9yayBDaXR5MREwDwYDVQQIEwhOZXcgWW9yazELMAkGA1UE
+BhMCVVMwHhcNMTQwNzE3MTYwMDAwWhcNMjAwNzE3MTYwMDAwWjB0MRcwFQYDVQQD
+Ew5LZXJuZWwgVGVzdCBDQTEPMA0GA1UECxMGS2VybmVsMRAwDgYDVQQKEwdNb25n
+b0RCMRYwFAYDVQQHEw1OZXcgWW9yayBDaXR5MREwDwYDVQQIEwhOZXcgWW9yazEL
+MAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBxSXj
+qA5y2EMQkcmvLDNikE88Og3+spJ3ex60HWVPk8EeXN68jyfbKLYsoCcBE2rBAE/N
+shVBJa8irh0o/UTh1XNW4iGCsfMvYamXiHnaOjmGVKjfBoj6pzQH0uK0X5olm3Sa
+zZPkLLCR81yxsK6woJZMFTvrlEjxj/SmDZ9tVXW692bC4i6nGvOCSpgv9kms85xO
+Ed2xbuCLXFDXKafXZd5AK+iegkDs3ah7VXMEE8sbqGnlqC1nsy5bpCnb7aC+3af7
+SV2XEFlSQT5kwTmk9CvTDzM9O78SO8nNhEOFBLQEdGDGd3BShE8dCdh2JTy3zKsb
+WeE+mxy0mEwxNfGfAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBAANwbvhM5K/Jcl6yzUSqAawvyAypT5aWBob7rt9KFq/aemjMN0gY2nsS
+8WTGd9jiXlxGc/TzrK6MOsJ904UAFE1L9uR//G1gIBa9dNbYoiii2Fc8b1xDVJEP
+b23rl/+GAT6UTSY+YgEjeA4Jk6H9zotO07lSw06rbCQam5SdA5UiMvuLHWCo3BHY
+8WzqLiW/uHlb4K5prF9yuTUBEIgkRvvvyOKXlRvm1Ed5UopT2hmwA86mffAfgJc2
+vSbm9/8Q00fYwO7mluB6mbEcnbquaqRLoB83k+WbwUAZ2yjWHXuXVMPwyaysazcp
+nOjaLwQJQgKejY62PiNcw7xC/nIxBeI=
-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAgcUl46gOcthDEJHJrywzYpBPPDoN/rKSd3setB1lT5PBHlze
+vI8n2yi2LKAnARNqwQBPzbIVQSWvIq4dKP1E4dVzVuIhgrHzL2Gpl4h52jo5hlSo
+3waI+qc0B9LitF+aJZt0ms2T5CywkfNcsbCusKCWTBU765RI8Y/0pg2fbVV1uvdm
+wuIupxrzgkqYL/ZJrPOcThHdsW7gi1xQ1ymn12XeQCvonoJA7N2oe1VzBBPLG6hp
+5agtZ7MuW6Qp2+2gvt2n+0ldlxBZUkE+ZME5pPQr0w8zPTu/EjvJzYRDhQS0BHRg
+xndwUoRPHQnYdiU8t8yrG1nhPpsctJhMMTXxnwIDAQABAoIBAD5iGOnM800wO2Uu
+wGbOd9FNEFoiinHDRHfdnw/1BavwmqjO+mBo7T8E3jarsrRosiwfyz1V+7O6uuuQ
+CgKXZlKuOuksgfGDPCWt7EolWHaZAOhbsGaujJD6ah/MuCD/yGmFxtNYOl05QpSX
+Cht9lSzhtf7TQl/og/xkOLbO27JB540ck/OCSOczXg9Z/O8AmIUyDn7AKb6G1Zhk
+2IN//HQoAvDUMZLWrzy+L7YGbA8pBR3yiPsYBH0rX2Oc9INpiGA+B9Nf1HDDsxeZ
+/o+5xLbRDDfIDtlYO0cekJ053W0zUQLrMEIn9991EpG2O/fPgs10NlKJtaFH8CmT
+ExgVA9ECgYEA+6AjtUdxZ0BL3Wk773nmhesNH5/5unWFaGgWpMEaEM7Ou7i6QApL
+KAbzOYItV3NNCbkcrejq7jsDGEmiwUOdXeQx6XN7/Gb2Byc/wezy5ALi0kcUwaur
+6s9+Ah+T4vcU2AjfuCWXIpe46KLEbwORmCRQGwkCBCwRhHGt5sGGxTkCgYEAhAaw
+voHI6Cb+4z3PNAKRnf2rExBYRyCz1KF16ksuwJyQSLzFleXRyRWFUEwLuVRL0+EZ
+JXhMbtrILrc23dJGEsB8kOCFehSH/IuL5eB0QfKpDFA+e6pimsbVeggx/rZhcERB
+WkcV3jN4O82gSL3EnIgvAT1/nwhmbmjvDhFJhZcCgYBaW4E3IbaZaz9S/O0m69Fa
+GbQWvS3CRV1oxqgK9cTUcE9Qnd9UC949O3GwHw0FMERjz3N7B/8FGW/dEuQ9Hniu
+NLmvqWbGlnqWywNcMihutJKbDCdp/Km5olUPkiNbB3sWsOkViXoiU/V0pK6BZvir
+d67EZpGwydpogyH9kVVCEQKBgGHXc3Q7SmCBRbOyQrQQk0m6i+V8328W1S5m2bPg
+M62aWXMOMn976ZRT1pBDSwz1Y5yJ3NDf7gTZLjEwpgCNrFCJRcc4HLL0NDL8V5js
+VjvpUU5GyYdsJdb+M4ZUPHi/QEaqzqPQumwJSLlJEdfWirZWVj9dDA8XcpGwQjjy
+psHRAoGBAJUTgeJYhjK7k5sgfh+PRqiRJP0msIH8FK7SenBGRUkelWrW6td2Riey
+EcOCMFkRWBeDgnZN5xDyWLBgrzpw9iHQQIUyyBaFknQcRUYKHkCx+k+fr0KHHCUb
+X2Kvf0rbeMucb4y/h7950HkBBq83AYKMAoI8Ql3cx7pKmyOLXRov
+-----END RSA PRIVATE KEY----- \ No newline at end of file
diff --git a/src/mongo/gotools/common/db/openssl/testdata/server.pem b/src/mongo/gotools/common/db/openssl/testdata/server.pem
index d2aaa930ff5..df2b49163d6 100644
--- a/src/mongo/gotools/common/db/openssl/testdata/server.pem
+++ b/src/mongo/gotools/common/db/openssl/testdata/server.pem
@@ -1,32 +1,48 @@
------BEGIN PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALOkdwU9Qx4FRn+z
-coBkeYYpVRg0pknPMDo4Q50TqZPfVhroTynx2Or+cjl5csd5hMKxWQpdzGq8JzH9
-2BCLcDz/51vG3tPrpLIB50ABqa0wRGGDOO+XN0h+VkdqJvKReWOsNRoMT3s0Lh78
-BqvRUomYXnbc1RBaxwWa+UoLCFgnAgMBAAECgYBd9XmjLeW6//tds5gB+4tsVpYB
-cRhAprOM3/zNXYlmpHu+2x78y1gvoSJRWWplVvPPeT8fIuxWL0844JJwJN5wyCwN
-nnrA28l6+Tcde+NlzCxwED+QDjAH20BRxCs0BLvnx3WAXRDmUbWAjOl/qPn9H6m1
-nmUQ7H/f6dxZ0vVMQQJBAOl3xeVLyZZ828P/p3PvYkaeIxxVK1QDGOWi/3vC0DrY
-WK8xAoopjj0RHHZ1fL5bG31G3OR9Vc/rfk4a5XPIlRECQQDE+teCTiwV5Wwzdpg3
-r440qOLCmpMXwJr/Jlh+C4c8ebnIQ9P5sSe4wQNHyeEZ2t7SGvPfjr7glpPhAkXy
-JTm3AkEAvNPgvVoUy6Bk5xuJRl2hMNiKMUo5ZxOyOVkiJeklHdMJt3h+Q1zk7ENA
-sBbKM/PgQezkj/FHTIl9eJKMbp8W4QJBAL4aXHyslw12wisUrKkpa7PUviwT5BvL
-TYsrZcIXvCeYTr1BAMX8vBopZNIWuoEqY1sgmfZKnFrB1+wTNpAQbxcCQQCHbtvQ
-1U2p5Pz5XYyaoK2OEZhPMuLnOBMpzjSxRLxKyhb4k+ssIA0IeAiT4RIECtHJ8DJX
-4aZK/qg9WmBH+zbO
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICbzCCAdgCAQEwDQYJKoZIhvcNAQEFBQAwgYYxCzAJBgNVBAYTAlVTMREwDwYD
-VQQIDAhOZXcgWW9yazEWMBQGA1UEBwwNTmV3IFlvcmsgQ2l0eTEdMBsGA1UECgwU
-TW9uZ29EQiBLZXJuZWwgVG9vbHMxGTAXBgNVBAsMEFRvb2xzIFRlc3RpbmcgQ0Ex
-EjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xNTA2MDUxNTUxNDVaFw0zNTA2MDQxNTUx
-NDVaMHkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazEWMBQGA1UEBwwN
-TmV3IFlvcmsgQ2l0eTEUMBIGA1UECgwLTW9uZ29EQiBJbmMxFTATBgNVBAsMDEtl
-cm5lbCBUb29sczESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCzpHcFPUMeBUZ/s3KAZHmGKVUYNKZJzzA6OEOdE6mT31Ya6E8p
-8djq/nI5eXLHeYTCsVkKXcxqvCcx/dgQi3A8/+dbxt7T66SyAedAAamtMERhgzjv
-lzdIflZHaibykXljrDUaDE97NC4e/Aar0VKJmF523NUQWscFmvlKCwhYJwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBACJiTnC3nksZsmMyD88+DuV8IA1DHSby4X/qtDYT
-eSuNbxRKnihXkm2KE+MGn7YeKg4a7FaYiH3ejk0ZBlY3TZXK3I1uh/zIhC9aMnSL
-z0z4OLcqp46F8PpYF7ARtXXWQuOEWe6k+VKy5XP1NX60sEJ0KwGBQjUw3Ys41JE8
-iigw
+-----BEGIN CERTIFICATE-----
+MIIDfjCCAmagAwIBAgIBBzANBgkqhkiG9w0BAQUFADB0MRcwFQYDVQQDEw5LZXJu
+ZWwgVGVzdCBDQTEPMA0GA1UECxMGS2VybmVsMRAwDgYDVQQKEwdNb25nb0RCMRYw
+FAYDVQQHEw1OZXcgWW9yayBDaXR5MREwDwYDVQQIEwhOZXcgWW9yazELMAkGA1UE
+BhMCVVMwHhcNMTQwNzE3MTYwMDAwWhcNMjAwNzE3MTYwMDAwWjBsMQ8wDQYDVQQD
+EwZzZXJ2ZXIxDzANBgNVBAsTBktlcm5lbDEQMA4GA1UEChMHTW9uZ29EQjEWMBQG
+A1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlvcmsxCzAJBgNVBAYT
+AlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp76KJeDczBqjSPJj
+5f8DHdtrWpQDK9AWNDlslWpi6+pL8hMqwbX0D7hC2r3kAgccMyFoNIudPqIXfXVd
+1LOh6vyY+jveRvqjKW/UZVzZeiL4Gy4bhke6R8JRC3O5aMKIAbaiQUAI1Nd8LxIt
+LGvH+ia/DFza1whgB8ym/uzVQB6igOifJ1qHWJbTtIhDKaW8gvjOhv5R3jzjfLEb
+R9r5Q0ZyE0lrO27kTkqgBnHKPmu54GSzU/r0HM3B+Sc/6UN+xNhNbuR+LZ+EvJHm
+r4de8jhW8wivmjTIvte33jlLibQ5nYIHrlpDLEwlzvDGaIio+OfWcgs2WuPk98MU
+tht0IQIDAQABoyMwITAfBgNVHREEGDAWgglsb2NhbGhvc3SCCTEyNy4wLjAuMTAN
+BgkqhkiG9w0BAQUFAAOCAQEANoYxvVFsIol09BQA0fwryAye/Z4dYItvKhmwB9VS
+t99DsmJcyx0P5meB3Ed8SnwkD0NGCm5TkUY/YLacPP9uJ4SkbPkNZ1fRISyShCCn
+SGgQUJWHbCbcIEj+vssFb91c5RFJbvnenDkQokRvD2VJWspwioeLzuwtARUoMH3Y
+qg0k0Mn7Bx1bW1Y6xQJHeVlnZtzxfeueoFO55ZRkZ0ceAD/q7q1ohTXi0vMydYgu
+1CB6VkDuibGlv56NdjbttPJm2iQoPaez8tZGpBo76N/Z1ydan0ow2pVjDXVOR84Y
+2HSZgbHOGBiycNw2W3vfw7uK0OmiPRTFpJCmewDjYwZ/6w==
-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAp76KJeDczBqjSPJj5f8DHdtrWpQDK9AWNDlslWpi6+pL8hMq
+wbX0D7hC2r3kAgccMyFoNIudPqIXfXVd1LOh6vyY+jveRvqjKW/UZVzZeiL4Gy4b
+hke6R8JRC3O5aMKIAbaiQUAI1Nd8LxItLGvH+ia/DFza1whgB8ym/uzVQB6igOif
+J1qHWJbTtIhDKaW8gvjOhv5R3jzjfLEbR9r5Q0ZyE0lrO27kTkqgBnHKPmu54GSz
+U/r0HM3B+Sc/6UN+xNhNbuR+LZ+EvJHmr4de8jhW8wivmjTIvte33jlLibQ5nYIH
+rlpDLEwlzvDGaIio+OfWcgs2WuPk98MUtht0IQIDAQABAoIBACgi1ilECXCouwMc
+RDzm7Jb7Rk+Q9MVJ79YlG08Q+oRaNjvAzE03PSN5wj1WjDTUALJXPvi7oy82V4qE
+R6Q6Kvbv46aUJpYzKFEk2dw7ACpSLa1LNfjGNtMusnecA/QF/8bxLReRu8s5mBQn
+NDnZvCqllLbfjNlAvsF+/UIn5sqFZpAZPMtPwkTAeh5ge8H9JvrG8y8aXsiFGAhV
+Z7tMZyn8wPCUrRi14NLvVB4hxM66G/tuTp8r9AmeTU+PV+qbCnKXd+v0IS52hvX9
+z75OPfAc66nm4bbPCapb6Yx7WaewPXXU0HDxeaT0BeQ/YfoNa5OT+ZOX1KndSfHa
+VhtmEsECgYEA3m86yYMsNOo+dkhqctNVRw2N+8gTO28GmWxNV9AC+fy1epW9+FNR
+yTQXpBkRrR7qrd5mF7WBc7vAIiSfVs021RMofzn5B1x7jzkH34VZtlviNdE3TZhx
+lPinqo0Yy3UEksgsCBJFIofuCmeTLk4ZtqoiZnXr35RYibaZoQdUT4kCgYEAwQ6Y
+xsKFYFks1+HYl29kR0qUkXFlVbKOhQIlj/dPm0JjZ0xYkUxmzoXD68HrOWgz7hc2
+hZaQTgWf+8cRaZNfh7oL+Iglczc2UXuwuUYguYssD/G6/ZPY15PhItgCghaU5Ewy
+hMwIJ81NENY2EQTgk/Z1KZitXdVJfHl/IPMQgdkCgYASdqkqkPjaa5dDuj8byO8L
+NtTSUYlHJbAmjBbfcyTMG230/vkF4+SmDuznci1FcYuJYyyWSzqzoKISM3gGfIJQ
+rYZvCSDiu4qGGPXOWANaX8YnMXalukGzW/CO96dXPB9lD7iX8uxKMX5Q3sgYz+LS
+hszUNHWf2XB//ehCtZkKAQKBgQCxL2luepeZHx82H9T+38BkYgHLHw0HQzLkxlyd
+LjlE4QCEjSB4cmukvkZbuYXfEVEgAvQKVW6p/SWhGkpT4Gt8EXftKV9dyF21GVXQ
+JZnhUOcm1xBsrWYGLXYi2agrpvgONBTlprERfq5tdnz2z8giZL+RZswu45Nnh8bz
+AcKzuQKBgQCGOQvKvNL5XKKmws/KRkfJbXgsyRT2ubO6pVL9jGQG5wntkeIRaEpT
+oxFtWMdPx3b3cxtgSP2ojllEiISk87SFIN1zEhHZy/JpTF0GlU1qg3VIaA78M1p2
+ZdpUsuqJzYmc3dDbQMepIaqdW4xMoTtZFyenUJyoezz6eWy/NlZ/XQ==
+-----END RSA PRIVATE KEY----- \ No newline at end of file
diff --git a/src/mongo/gotools/import.data b/src/mongo/gotools/import.data
index d4e8508aab4..8354583635e 100644
--- a/src/mongo/gotools/import.data
+++ b/src/mongo/gotools/import.data
@@ -1,5 +1,5 @@
{
- "commit": "0373beacadd1b314e2da616acefc5804889eb92c",
+ "commit": "e46dcde7151b8fcd97a311afdc14de3aad82f10b",
"github": "mongodb/mongo-tools.git",
"vendor": "tools",
"branch": "v4.0"
diff --git a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/harness/mongojs/init.js b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/harness/mongojs/init.js
index c3007d313dc..7dd0362270b 100644
--- a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/harness/mongojs/init.js
+++ b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/harness/mongojs/init.js
@@ -136,7 +136,7 @@ function configAuth(addr) {
} else {
db.addUser("reader", "rapadura", true)
}
- if (v > [3, 6] && addr == "127.0.0.1:40002") {
+ if (v > [3, 7] && addr == "127.0.0.1:40002") {
// username IX is used for SCRAM-SHA-256 so we can test saslprep on it
db.createUser({user:"IX", pwd:"IX", mechanisms: ["SCRAM-SHA-256"], roles: ["readAnyDatabase"]})
db.createUser({user:"\u2168", pwd:"\u2163", mechanisms: ["SCRAM-SHA-256"], roles: ["readAnyDatabase"]})
diff --git a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session.go b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session.go
index 3e234f8318c..314e5e29ccc 100644
--- a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session.go
+++ b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session.go
@@ -4068,7 +4068,13 @@ func (iter *Iter) getMore() {
} else {
op = &iter.op
}
- if err := socket.Query(op); err != nil {
+ // We unlock the iterator around socket.Query because it will call the
+ // replyFunc if the socket is dead, which would deadlock if the iterator
+ // were still locked.
+ iter.m.Unlock()
+ err = socket.Query(op)
+ iter.m.Lock()
+ if err != nil {
iter.docsToReceive--
iter.err = err
}
diff --git a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session_test.go b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session_test.go
index 7da5422d9c6..b95d00eb360 100644
--- a/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session_test.go
+++ b/src/mongo/gotools/vendor/src/gopkg.in/mgo.v2/session_test.go
@@ -957,6 +957,9 @@ func (s *S) TestCreateCollectionCapped(c *C) {
}
func (s *S) TestCreateCollectionNoIndex(c *C) {
+ if s.versionAtLeast(3, 7) {
+ c.Skip("autoIndexId removed in MongoDB 3.7+")
+ }
session, err := mgo.Dial("localhost:40001")
c.Assert(err, IsNil)
defer session.Close()
@@ -977,6 +980,9 @@ func (s *S) TestCreateCollectionNoIndex(c *C) {
}
func (s *S) TestCreateCollectionForceIndex(c *C) {
+ if s.versionAtLeast(3, 7) {
+ c.Skip("autoIndexId removed in MongoDB 3.7+")
+ }
session, err := mgo.Dial("localhost:40001")
c.Assert(err, IsNil)
defer session.Close()
@@ -3129,7 +3135,7 @@ func (s *S) TestEnsureIndex(c *C) {
defer session.Close()
coll := session.DB("mydb").C("mycoll")
-// idxs := session.DB("mydb").C("system.indexes")
+ // idxs := session.DB("mydb").C("system.indexes")
for _, test := range indexTests {
if !s.versionAtLeast(2, 4) && test.expected["textIndexVersion"] != nil {
@@ -3148,23 +3154,22 @@ func (s *S) TestEnsureIndex(c *C) {
expectedName, _ = test.expected["name"].(string)
}
-
-// obtained := M{}
-// err = idxs.Find(M{"name": expectedName}).One(obtained)
-// c.Assert(err, IsNil) // XXX ERR HERE
-//
-// delete(obtained, "v")
-//
-// if s.versionAtLeast(2, 7) {
-// // Was deprecated in 2.6, and not being reported by 2.7+.
-// delete(test.expected, "dropDups")
-// test.index.DropDups = false
-// }
-// if s.versionAtLeast(3, 2) && test.expected["textIndexVersion"] != nil {
-// test.expected["textIndexVersion"] = 3
-// }
-//
-// c.Assert(obtained, DeepEquals, test.expected)
+ // obtained := M{}
+ // err = idxs.Find(M{"name": expectedName}).One(obtained)
+ // c.Assert(err, IsNil) // XXX ERR HERE
+ //
+ // delete(obtained, "v")
+ //
+ // if s.versionAtLeast(2, 7) {
+ // // Was deprecated in 2.6, and not being reported by 2.7+.
+ // delete(test.expected, "dropDups")
+ // test.index.DropDups = false
+ // }
+ // if s.versionAtLeast(3, 2) && test.expected["textIndexVersion"] != nil {
+ // test.expected["textIndexVersion"] = 3
+ // }
+ //
+ // c.Assert(obtained, DeepEquals, test.expected)
// The result of Indexes must match closely what was used to create the index.
indexes, err := coll.Indexes()
@@ -3271,7 +3276,6 @@ func (s *S) TestEnsureIndexKey(c *C) {
err = coll.EnsureIndexKey("a", "-b")
c.Assert(err, IsNil)
-
result1, err := findIndexByName(coll, "a_1")
c.Assert(err, IsNil)
c.Assert(result1.Key, DeepEquals, []string{"a"})
View Lorry Controller Status